Bug 510451 - Reimplement the ISO42010 specification to properly support

architectural contexts and viewpoints

Replaced the viewpoint configuration framework by a new architectural
context/viewpoint framework. This involves defining architecture
contexts and viewpoints in models and contributing them via extension
points or via the preferences. Models reference an architecture context
and a set of viewpoints at creation time, but can be switched later.
Architecture contexts double as client contexts for which
elementtypesetconfigurations can be registered. They also define
viewpoints, which reference representation kinds (diagrams or tables).
This contribution defines three architecture contexts: UML, Profile, and
SysML corresponding to what Papyrus used to call diagram categories.

Change-Id: I203b58d9e97afdffc45c2674683c0281eb8a7c5b
Signed-off-by: Maged Elaasar <melaasar@gmail.com>

111 files changed, 3710 insertions, 5196 deletions

diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.file.tests/META-INF/MANIFEST.MF b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.file.tests/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..e881e6c5d7f
--- /dev/null
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.file.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,21 @@
+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",
+ org.eclipse.core.resources;bundle-version="3.8.0",
+ org.eclipse.jdt.ui;bundle-version="3.8.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
+ org.eclipse.compare;bundle-version="3.5.300",
+ org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0",
+ org.junit;bundle-version="4.10.0"
+Export-Package: org.eclipse.papyrus.uml.compare.file.tests
+Bundle-Vendor: %Bundle-Vendor
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %Bundle-Name
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.uml.compare.file.tests.Activator
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.uml.compare.file.tests
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.tests/META-INF/MANIFEST.MF b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.tests/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..233bdc18d1d
--- /dev/null
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,25 @@
+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",
+ org.eclipse.core.resources,
+ org.eclipse.papyrus.views.modelexplorer;bundle-version="1.2.0",
+ org.eclipse.uml2.uml;bundle-version="4.0.0",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
+ org.eclipse.papyrus.uml.compare;bundle-version="1.2.0",
+ org.eclipse.compare;bundle-version="3.5.300",
+ org.eclipse.papyrus.uml.compare;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
+ org.eclipse.ui.ide;bundle-version="3.8.0",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",
+ org.junit;bundle-version="4.10.0"
+Export-Package: org.eclipse.papyrus.uml.compare.tests
+Bundle-Vendor: %Bundle-Vendor
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %Bundle-Name
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.uml.compare.tests.Activator
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.uml.compare.tests
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.clipboard.tests/src/org/eclipse/papyrus/infra/core/clipboard/tests/CopierFactoryTest.java b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.clipboard.tests/src/org/eclipse/papyrus/infra/core/clipboard/tests/CopierFactoryTest.java
new file mode 100644
index 00000000000..ace4f0b4aa4
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.clipboard.tests/src/org/eclipse/papyrus/infra/core/clipboard/tests/CopierFactoryTest.java
@@ -0,0 +1,185 @@
+/*****************************************************************************
+ * Copyright (c) 2016 Christian W. Damus and others.
+ * 
+ * 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:
+ *   Christian W. Damus - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.core.clipboard.tests;
+
+import static org.eclipse.papyrus.junit.matchers.MoreMatchers.greaterThan;
+import static org.eclipse.papyrus.junit.matchers.MoreMatchers.isEmpty;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.CoreMatchers.sameInstance;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import org.eclipse.emf.ecore.EAnnotation;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EOperation;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EcoreFactory;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.papyrus.infra.core.clipboard.ICopierFactory;
+import org.eclipse.papyrus.infra.core.clipboard.ICopierFactory.Configuration;
+import org.eclipse.papyrus.infra.core.internal.clipboard.CopierFactory;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TestRule;
+import org.junit.rules.TestWatcher;
+import org.junit.runner.Description;
+
+/**
+ * Test cases for the {@link CopierFactory} class.
+ */
+@SuppressWarnings("restriction")
+public class CopierFactoryTest {
+
+	@Rule
+	public final TestRule configRule = TestConfigurator.rule();
+
+	/**
+	 * Initializes me.
+	 */
+	public CopierFactoryTest() {
+		super();
+	}
+
+	/**
+	 * Tests the factory with the default copy behaviour.
+	 */
+	@Test
+	public void defaultCopierFactory() {
+		EClass original = createTestModel();
+
+		EcoreUtil.Copier copier = ICopierFactory.getInstance(null).get();
+		EClass copy = copy(original, copier);
+
+		// Check that we have the copy we expect
+		assertThat(copy, not(sameInstance(original)));
+		assertThat(copy.getName(), is(original.getName()));
+		assertThat(copy.getEReferences().size(), is(2));
+
+		// And that the correct filtering was applied
+		copy.getEReferences().forEach(ref -> assertThat(ref.getEOpposite(), nullValue()));
+
+		// Not this
+		assertThat(copy.getEReferences().stream().flatMap(ref -> ref.getEAnnotations().stream())
+				.peek(a -> assertThat(a.getReferences(), not(isEmpty())))
+				.count(), greaterThan(0L)); // In fact we have tested at least one
+	}
+
+	/**
+	 * Tests the factory with non-default copy behaviour to verify that
+	 * configurators see the correct options in in the representationKind.
+	 */
+	@Test
+	public void oneOffCopierFactory() {
+		EClass original = createTestModel();
+
+		EcoreUtil.Copier copier = ICopierFactory.getInstance(null, false).get();
+		EClass copy = copy(original, copier);
+
+		// Check that we have the copy we expect
+		assertThat(copy, not(sameInstance(original)));
+		assertThat(copy.getName(), is(original.getName()));
+		assertThat(copy.getEReferences().size(), is(2));
+
+		// And that the correct filtering was applied
+		assertThat(copy.getEReferences().stream().flatMap(ref -> ref.getEAnnotations().stream())
+				.peek(a -> assertThat(a.getReferences(), isEmpty()))
+				.count(), greaterThan(0L)); // In fact we have tested at least one
+
+		// Not this
+		copy.getEReferences().forEach(ref -> assertThat(ref.getEOpposite(), notNullValue()));
+	}
+
+	//
+	// Test framework
+	//
+
+	EClass createTestModel() {
+		EClass result = EcoreFactory.eINSTANCE.createEClass();
+		result.setName("Test");
+
+		EReference r1 = EcoreFactory.eINSTANCE.createEReference();
+		r1.setName("r1");
+		result.getEStructuralFeatures().add(r1);
+
+		EReference r2 = EcoreFactory.eINSTANCE.createEReference();
+		r2.setName("r2");
+		result.getEStructuralFeatures().add(r2);
+
+		r2.setEOpposite(r1);
+		r1.setEOpposite(r2);
+
+		EOperation o1 = EcoreFactory.eINSTANCE.createEOperation();
+		o1.setName("o1");
+		result.getEOperations().add(o1);
+
+		EAnnotation annotation = EcoreFactory.eINSTANCE.createEAnnotation();
+		annotation.setSource("test");
+		r1.getEAnnotations().add(annotation);
+		annotation.getReferences().add(o1);
+
+		return result;
+	}
+
+	<T extends EObject> T copy(T original, EcoreUtil.Copier copier) {
+		@SuppressWarnings("unchecked")
+		T result = (T) copier.copy(original);
+		copier.copyReferences();
+		return result;
+	}
+
+	//
+	// Nested types
+	//
+
+	public static final class TestConfigurator implements ICopierFactory.Configurator {
+		static boolean isEnabled;
+
+		@Override
+		public void configureCopier(Configuration copierConfiguration) {
+			if (isEnabled) {
+				if (copierConfiguration.isUseOriginalReferences()) {
+					filter(copierConfiguration, EcorePackage.Literals.EREFERENCE__EOPPOSITE);
+				} else {
+					filter(copierConfiguration, EcorePackage.Literals.EANNOTATION__REFERENCES);
+				}
+			}
+		}
+
+		void filter(Configuration copierConfig, EReference reference, EClass ownerType) {
+			copierConfig.filterReferences((ref, owner) -> (ref == reference) && ownerType.isInstance(owner));
+		}
+
+		void filter(Configuration copierConfig, EReference reference) {
+			filter(copierConfig, reference, reference.getEContainingClass());
+		}
+
+		static TestRule rule() {
+			return new TestWatcher() {
+				@Override
+				protected void starting(Description description) {
+					isEnabled = true;
+				}
+
+				@Override
+				protected void finished(Description description) {
+					isEnabled = false;
+				}
+			};
+		}
+	}
+}
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..56c1f23b479
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,96 @@
+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.common.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.services.resourceloading.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.service.types.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.clazz.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.bundles.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.views.modelexplorer.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.activity.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.deployment.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.component.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.usecase.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.statemachine.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.communication.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.dnd.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.emf.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.sasheditor.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.sasheditor.di.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.services.labelprovider.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.timing.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.editor.integration.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.search.tests;bundle-version="1.2.0",
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.uml.tools.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.tools.utils.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.nattable.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.nattable.clazz.config.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.nattable.model.editor.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.sequence.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.interactionoverview.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.composite.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.css.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.types.tests;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.commands.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.emf.readonly.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.common.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.tools.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.wizards.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.modelrepair.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.profile.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.profile.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.services.controlmode.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.nattable.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.nattable.views.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.nattable.generic.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.modelexplorer.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.textedit.port.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.textedit.property.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.textedit.parameter.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.decoratormodel.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.decoratormodel.controlmode.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.menu.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.nattable.model.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.tests.diagramassistants;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.profile.drafter.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.canonical.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.alf.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.textedit.valuespecification.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.clipboard.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.nattable.stereotype.display.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.tests.framework;bundle-version="1.2.0",
+ org.eclipse.xtend.lib;bundle-version="2.8.1",
+ org.eclipse.papyrus.infra.nattable.common.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.editor.welcome.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.welcome.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.validation.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.ui.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.ui.emf.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.services.edit.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.services.edit.ui.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.types.ui.tests;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.services.semantic.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.service.types.ui.tests;bundle-version="1.2.0",
+ org.eclipse.papyrus.eclipse.project.editors.tests;bundle-version="2.0.0",
+ org.eclipse.papyrus.infra.emf.gmf.tests;bundle-version="1.2.1",
+ org.eclipse.papyrus.infra.internationalization.tests;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.properties.ui.tests;bundle-version="1.2.1",
+ org.eclipse.papyrus.uml.internationalization.tests;bundle-version="1.0.0",
+ org.eclipse.papyrus.uml.internationalization.controlmode.tests;bundle-version="1.0.0"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.100.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.tests.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.tests
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java
new file mode 100644
index 00000000000..1a4401175fe
--- /dev/null
+++ b/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java
@@ -0,0 +1,161 @@
+/*****************************************************************************
+ * Copyright (c) 2010, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * 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:
+ *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bugs 402525, 323802, 431953, 433310, 434993
+ *  Christian W. Damus - bugs 399859, 451230, 433206, 463156, 474610, 469188, 485220, 488791, 496598, 508629
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.tests;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.papyrus.junit.framework.runner.AllTestsRunner;
+import org.eclipse.papyrus.junit.framework.runner.ITestSuiteClass;
+import org.eclipse.papyrus.junit.framework.runner.PluginTestSuiteClass;
+import org.eclipse.papyrus.junit.framework.runner.SuiteSpot;
+import org.junit.runner.RunWith;
+
+
+/**
+ * Test class for all tests for Papyrus
+ */
+@RunWith(AllTestsRunner.class)
+public class AllTests {
+
+	@SuiteSpot
+	public static final List<ITestSuiteClass> suiteClasses;
+
+	/** list of classes to launch */
+	static {
+		suiteClasses = new ArrayList<>();
+
+		/* **************** plugins *********************** */
+		/* developper */
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.bundles.tests.AllTests.class));
+
+		/* core */
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.core.tests.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.core.clipboard.tests.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.core.sasheditor.tests.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.core.sasheditor.di.tests.AllTests.class));
+
+		/* infra */
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.tools.tests.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.ui.tests.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.services.edit.tests.suites.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.services.edit.ui.tests.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.services.labelprovider.tests.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.services.semantic.tests.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.emf.tests.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.emf.gmf.tests.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.ui.emf.tests.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.types.tests.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.types.ui.tests.AllTests.class));
+		// suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.services.openelement.tests.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.gmfdiag.commands.tests.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.gmfdiag.common.tests.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.gmfdiag.canonical.tests.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.emf.readonly.tests.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.editor.welcome.tests.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.gmfdiag.welcome.tests.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.properties.ui.tests.AllTests.class));
+
+		/* customization */
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.eclipse.project.editors.tests.AllTests.class));
+
+		/* views */
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.views.modelexplorer.tests.AllTests.class));
+
+		/* integration */
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.editor.integration.tests.AllTests.class));
+
+		// FIXME: Workaround for Bug 441246: Move the ResourceLoading tests after EditorReloadTest, since they are currently conflicting
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.services.resourceloading.tests.AllTests.class));
+
+		/* search */
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.search.tests.suites.AllTests.class));
+
+		/* css */
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.gmfdiag.css.tests.tests.AllTests.class));
+
+		/* menu */
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.gmfdiag.menu.tests.tests.AllTests.class));
+
+		/* control mode */
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.services.controlmode.tests.AllTests.class));
+
+		/* Diagram Assistants test suite */
+		org.eclipse.papyrus.tests.diagramassistants.AllTests.appendTo(suiteClasses);
+
+		/* Profile Drafter */
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.profile.drafter.tests.AllTests.class));
+
+		/* uml */
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.service.types.tests.suites.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.service.types.ui.tests.suites.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.modelexplorer.tests.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.dnd.tests.tests.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.tools.tests.tests.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.tools.utils.tests.tests.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.stereotypeproperty.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.wizards.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.modelrepair.tests.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.profile.tests.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.decoratormodel.tests.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.decoratormodel.controlmode.tests.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.validation.tests.AllTests.class));
+
+		/* uml diagrams */
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.common.tests.tests.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.clazz.test.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.activity.tests.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.deployment.test.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.component.test.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.timing.tests.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.usecase.tests.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.composite.test.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.statemachine.tests.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.communication.tests.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.profile.tests.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.sequence.tests.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.interactionoverview.tests.AllTests.class));
+		//
+
+		// nattable tests
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.nattable.views.tests.tests.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.nattable.common.tests.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.nattable.model.editor.tests.tests.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.nattable.model.tests.tests.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.nattable.tests.tests.AllTests.class));
+
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.nattable.tests.tests.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.nattable.generic.tests.tests.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.nattable.clazz.config.tests.tests.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.nattable.stereotype.display.tests.tests.AllTests.class));
+
+		// uml textedit tests
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.textedit.port.tests.suites.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.textedit.property.tests.suites.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.textedit.parameter.tests.suites.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.textedit.valuespecification.tests.suites.AllTests.class));
+
+		// Alf
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.alf.tests.AllTests.class));
+		
+		// Internationalization
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.internationalization.tests.tests.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.internationalization.tests.tests.AllTests.class));
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.internationalization.controlmode.tests.tests.AllTests.class));
+
+		// end
+	}
+
+}
diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/ModelSetTests.java b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/ModelSetTests.java
index 79f6099c62b..ebfd7b5d3aa 100644
--- a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/ModelSetTests.java
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/ModelSetTests.java
@@ -15,15 +15,17 @@ import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.papyrus.commands.ICreationCommand;
 import org.eclipse.papyrus.editor.integration.tests.Activator;
+import org.eclipse.papyrus.infra.architecture.commands.IModelCreationCommand;
 import org.eclipse.papyrus.infra.core.resource.ModelSet;
 import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
 import org.eclipse.papyrus.infra.core.services.ExtensionServicesRegistry;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
 import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
 import org.eclipse.papyrus.infra.core.utils.DiResourceSet;
-import org.eclipse.papyrus.infra.ui.extension.commands.IModelCreationCommand;
 import org.eclipse.papyrus.junit.utils.EditorUtils;
 import org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand;
 import org.eclipse.papyrus.uml.diagram.clazz.UmlClassDiagramForMultiEditor;
@@ -59,7 +61,7 @@ public class ModelSetTests extends AbstractEditorIntegrationTest {
 
 	@Test
 	public void testCreateModelWithSpecialChars() throws Exception {
-		ModelSet modelSet = new DiResourceSet();
+		final ModelSet modelSet = new DiResourceSet();
 		IProject emptyModelCreationProject = ResourcesPlugin.getWorkspace().getRoot().getProject("diagramCreationWithSpecialChars");
 		emptyModelCreationProject.create(new NullProgressMonitor());
 		emptyModelCreationProject.open(new NullProgressMonitor());
@@ -81,10 +83,17 @@ public class ModelSetTests extends AbstractEditorIntegrationTest {
 			//Ignore
 		}
 
-		IModelCreationCommand creationCommand = new CreateUMLModelCommand();
-		creationCommand.createModel(modelSet);
+		// create the UML model
+		TransactionalEditingDomain ted = modelSet.getTransactionalEditingDomain();
+		ted.getCommandStack().execute(new RecordingCommand(ted) {
+			@Override
+			protected void doExecute() {
+				IModelCreationCommand creationCommand = new CreateUMLModelCommand();
+				creationCommand.createModel(modelSet);
+			}
+		});
 
-		//Create the root UML Model
+		//get the root UML Model
 		UmlModel umlModel = (UmlModel)modelSet.getModel(UmlModel.MODEL_ID);
 		Model model = (Model)umlModel.lookupRoot();
 
diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/PageManagerTests.java b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/PageManagerTests.java
index 4bbcfb5f3c1..fb5fc9c013d 100644
--- a/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/PageManagerTests.java
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/src/org/eclipse/papyrus/editor/integration/tests/tests/PageManagerTests.java
@@ -38,6 +38,7 @@ import org.eclipse.papyrus.commands.DestroyElementPapyrusCommand;
 import org.eclipse.papyrus.commands.ICreationCommand;
 import org.eclipse.papyrus.commands.OpenDiagramCommand;
 import org.eclipse.papyrus.editor.integration.tests.Activator;
+import org.eclipse.papyrus.infra.architecture.commands.IModelCreationCommand;
 import org.eclipse.papyrus.infra.core.resource.ModelSet;
 import org.eclipse.papyrus.infra.core.sasheditor.editor.IPage;
 import org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer;
@@ -50,7 +51,6 @@ import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils;
 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.infra.ui.extension.commands.IModelCreationCommand;
 import org.eclipse.papyrus.junit.utils.EditorUtils;
 import org.eclipse.papyrus.uml.diagram.clazz.CreateClassDiagramCommand;
 import org.eclipse.papyrus.uml.diagram.clazz.UmlClassDiagramForMultiEditor;
@@ -81,7 +81,7 @@ public class PageManagerTests extends AbstractEditorIntegrationTest {
 
 	@Test
 	public void testModelWithDiagramCreation() throws Exception {
-		ModelSet modelSet = new DiResourceSet();
+		final ModelSet modelSet = new DiResourceSet();
 		IProject emptyModelCreationProject = ResourcesPlugin.getWorkspace().getRoot().getProject("diagramModelCreation");
 		emptyModelCreationProject.create(new NullProgressMonitor());
 		emptyModelCreationProject.open(new NullProgressMonitor());
@@ -101,8 +101,14 @@ public class PageManagerTests extends AbstractEditorIntegrationTest {
 			// Ignore
 		}
 
-		IModelCreationCommand creationCommand = new CreateUMLModelCommand();
-		creationCommand.createModel(modelSet);
+		TransactionalEditingDomain ted = modelSet.getTransactionalEditingDomain();
+		ted.getCommandStack().execute(new RecordingCommand(ted) {
+			@Override
+			protected void doExecute() {
+				IModelCreationCommand creationCommand = new CreateUMLModelCommand();
+				creationCommand.createModel(modelSet);
+			}
+		});
 
 		// Create the root UML Model
 		UmlModel umlModel = (UmlModel) modelSet.getModel(UmlModel.MODEL_ID);
@@ -162,7 +168,7 @@ public class PageManagerTests extends AbstractEditorIntegrationTest {
 	}
 
 	private IFile createEmptyModel() throws Exception {
-		ModelSet modelSet = new DiResourceSet();
+		final ModelSet modelSet = new DiResourceSet();
 		IProject emptyModelCreationProject = ResourcesPlugin.getWorkspace().getRoot().getProject("emptyModelCreation");
 		emptyModelCreationProject.create(new NullProgressMonitor());
 		emptyModelCreationProject.open(new NullProgressMonitor());
@@ -171,8 +177,16 @@ public class PageManagerTests extends AbstractEditorIntegrationTest {
 
 		modelSet.createsModels(emptyModelDi);
 
-		IModelCreationCommand creationCommand = new CreateUMLModelCommand();
-		creationCommand.createModel(modelSet);
+		// create the UML model
+		TransactionalEditingDomain ted = modelSet.getTransactionalEditingDomain();
+		ted.getCommandStack().execute(new RecordingCommand(ted) {
+			@Override
+			protected void doExecute() {
+				IModelCreationCommand creationCommand = new CreateUMLModelCommand();
+				creationCommand.createModel(modelSet);
+			}
+		});
+
 
 		modelSet.save(new NullProgressMonitor());
 
diff --git a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/META-INF/MANIFEST.MF
index 5c885189255..2bcedd26bfc 100755
--- a/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/core/org.eclipse.papyrus.infra.core.suite.tests/META-INF/MANIFEST.MF
@@ -17,4 +17,3 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.core.sasheditor.tests;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.core.sasheditor.di.tests;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.core.clipboard.tests;bundle-version="1.2.0"
- 
\ No newline at end of file
diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/META-INF/MANIFEST.MF
index c0c56f62f99..1b41a310fe7 100644
--- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/META-INF/MANIFEST.MF
@@ -10,7 +10,8 @@ Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="2.8.0",
  org.eclipse.papyrus.infra.emf;bundle-version="1.3.0",
  org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
  org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)"
+ org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="2.0.0"
 Bundle-Vendor: %providerName
 Bundle-Version: 1.4.0.qualifier
 Bundle-Name: %pluginName
diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/tests/org/eclipse/papyrus/infra/emf/advice/ReadOnlyObjectEditAdviceTest.java b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/tests/org/eclipse/papyrus/infra/emf/advice/ReadOnlyObjectEditAdviceTest.java
index 99b9593258e..e067f629ffc 100644
--- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/tests/org/eclipse/papyrus/infra/emf/advice/ReadOnlyObjectEditAdviceTest.java
+++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/tests/org/eclipse/papyrus/infra/emf/advice/ReadOnlyObjectEditAdviceTest.java
@@ -70,7 +70,9 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelations
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;
 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.services.edit.context.TypeContext;
 import org.eclipse.papyrus.junit.framework.classification.ClassificationRunnerWithParametersFactory;
 import org.eclipse.papyrus.junit.framework.classification.rules.Condition;
 import org.eclipse.papyrus.junit.framework.classification.rules.ConditionRule;
@@ -112,7 +114,7 @@ public class ReadOnlyObjectEditAdviceTest {
 
 	private static final String TEST_BUNDLE = "org.eclipse.papyrus.infra.emf.tests"; //$NON-NLS-1$
 
-	private static final IClientContext PAPYRUS_CONTEXT = ClientContextManager.getInstance().getClientContext("org.eclipse.papyrus.infra.services.edit.TypeContext"); //$NON-NLS-1$
+	private static IClientContext PAPYRUS_CONTEXT;
 
 	private static IAdapterFactory readOnlyHandlerAdapterFactory;
 
@@ -144,6 +146,11 @@ public class ReadOnlyObjectEditAdviceTest {
 
 	public ReadOnlyObjectEditAdviceTest() {
 		super();
+		try {
+			PAPYRUS_CONTEXT = TypeContext.getDefaultContext();
+		} catch (ServiceException e) {
+			fail("default context is not found.");
+		}
 	}
 
 	/**
diff --git a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/tests/ElementTypeFilterTest.java b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/tests/ElementTypeFilterTest.java
index 1206b98a62f..1938f2eef69 100644
--- a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/tests/ElementTypeFilterTest.java
+++ b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/tests/ElementTypeFilterTest.java
@@ -173,7 +173,7 @@ public class ElementTypeFilterTest extends TestCase {
 	{
 		IElementType type = ElementTypeRegistry.getInstance().getType("org.eclipse.papyrus.uml.AssociationBase");
 		Association association = UMLFactory.eINSTANCE.createAssociation();
-		IEditHelperContext editContext = new EditHelperContext(association, ElementTypeUtils.getEditContext());
+		IEditHelperContext editContext = new EditHelperContext(association, ElementTypeUtils.getDefaultClientContext());
 
 		assertThat(getFixture().matches(type), is(false));
 		assertThat(getFixture().matches(association), is(false));
diff --git a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/tests/ModelingAssistantProviderTest.java b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/tests/ModelingAssistantProviderTest.java
index f40675c6986..b7279de3fdc 100644
--- a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/tests/ModelingAssistantProviderTest.java
+++ b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/src-gen/org/eclipse/papyrus/infra/gmfdiag/assistant/tests/ModelingAssistantProviderTest.java
@@ -185,12 +185,12 @@ public class ModelingAssistantProviderTest extends TestCase {
 	 */
 	public void testGetClientContext()
 	{
-		assertThat(getFixture().getClientContext(), is(ElementTypeUtils.getEditContext()));
+		assertThat(getFixture().getClientContext(), is(ElementTypeUtils.getDefaultClientContext()));
 
 		getFixture().setClientContextID("org.eclipse.papyrus.uml.diagram.clazz.TypeContext");
 		IClientContext classDiagramContext = ClientContextManager.getInstance().getClientContext("org.eclipse.papyrus.uml.diagram.clazz.TypeContext");
 		if (classDiagramContext == null) {
-			assertThat(getFixture().getClientContext(), is(ElementTypeUtils.getEditContext()));
+			assertThat(getFixture().getClientContext(), is(ElementTypeUtils.getDefaultClientContext()));
 		} else {
 			assertThat(getFixture().getClientContext(), is(classDiagramContext));
 		}
diff --git a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/src/org/eclipse/papyrus/infra/gmfdiag/assistant/tests/AssistantsFixture.java b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/src/org/eclipse/papyrus/infra/gmfdiag/assistant/tests/AssistantsFixture.java
index 88e36d6256a..9f621b1c545 100644
--- a/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/src/org/eclipse/papyrus/infra/gmfdiag/assistant/tests/AssistantsFixture.java
+++ b/tests/junit/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant.tests/src/org/eclipse/papyrus/infra/gmfdiag/assistant/tests/AssistantsFixture.java
@@ -24,7 +24,7 @@ import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.infra.gmfdiag.assistant.core.IModelingAssistantModelProvider;
 import org.eclipse.papyrus.infra.gmfdiag.assistant.internal.core.DefaultModelingAssistantModelProvider;
 import org.eclipse.papyrus.infra.gmfdiag.assistant.internal.core.ModelingAssistantModelRegistry;
-import org.eclipse.papyrus.infra.services.edit.internal.context.TypeContext;
+import org.eclipse.papyrus.infra.services.edit.context.TypeContext;
 import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration;
 import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage;
 import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry;
@@ -65,7 +65,7 @@ public class AssistantsFixture extends TestWatcher {
 			ElementTypeSetConfiguration elementTypes = UMLUtil.load(resourceSet, elementTypesModelURI, ElementTypesConfigurationsPackage.Literals.ELEMENT_TYPE_SET_CONFIGURATION);
 
 			try {
-				ElementTypeSetConfigurationRegistry.getInstance().loadElementTypeSetConfiguration(TypeContext.getContext().getId(), (ElementTypeSetConfiguration) elementTypes);
+				ElementTypeSetConfigurationRegistry.getInstance().loadElementTypeSetConfiguration(TypeContext.getDefaultContext().getId(), (ElementTypeSetConfiguration) elementTypes);
 			} catch (ServiceException e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
@@ -74,7 +74,7 @@ public class AssistantsFixture extends TestWatcher {
 			elementTypesID = JUnitUtils.getTestClass(description).getName();
 
 			try {
-				String contextId = TypeContext.getContext().getId();
+				String contextId = TypeContext.getDefaultContext().getId();
 
 				if (!ElementTypeSetConfigurationRegistry.getInstance().getElementTypeSetConfigurations().containsKey(contextId)) {
 					ElementTypeSetConfigurationRegistry.getInstance().getElementTypeSetConfigurations().put(contextId, new HashMap<String, ElementTypeSetConfiguration>());
@@ -109,7 +109,7 @@ public class AssistantsFixture extends TestWatcher {
 
 		if (elementTypesID != null) {
 			try {
-				String contextId = TypeContext.getContext().getId();
+				String contextId = TypeContext.getDefaultContext().getId();
 
 				ElementTypeSetConfigurationRegistry.getInstance().unload(contextId, elementTypesID);
 			} catch (ServiceException e) {
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/src/org/eclipse/papyrus/infra/gmfdiag/canonical/tests/AbstractCanonicalTest.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/src/org/eclipse/papyrus/infra/gmfdiag/canonical/tests/AbstractCanonicalTest.java
index 36be68d674c..b2bad8632c1 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/src/org/eclipse/papyrus/infra/gmfdiag/canonical/tests/AbstractCanonicalTest.java
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.canonical.tests/src/org/eclipse/papyrus/infra/gmfdiag/canonical/tests/AbstractCanonicalTest.java
@@ -433,7 +433,7 @@ public class AbstractCanonicalTest extends AbstractPapyrusTest {
 
 	private List<? extends IElementType> getClassDiagramElementTypes(EClass metaclass) {
 		List<IElementType> result = Lists.newArrayListWithExpectedSize(3);
-		IElementType base = ElementTypeRegistry.getInstance().getElementType(metaclass, ElementTypeUtils.getEditContext());
+		IElementType base = ElementTypeRegistry.getInstance().getElementType(metaclass, ElementTypeUtils.getDefaultClientContext());
 
 		// Filter for class diagram types matching the exact metaclass (e.g., no Usage for Dependency or Port for Property)
 		for (IElementType next : ElementTypeRegistry.getInstance().getSpecializationsOf(base.getId())) {
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome.tests/META-INF/MANIFEST.MF
index a3a1ebdf301..61703d9b893 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome.tests/META-INF/MANIFEST.MF
@@ -14,7 +14,8 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.papyrus.infra.gmfdiag.welcome;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.editor.welcome.tests;bundle-version="1.2.0",
  org.eclipse.uml2.uml;bundle-version="5.1.100",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0"
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.gmfdiag.representation;bundle-version="1.0.0"
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName
 Bundle-Version: 1.2.0.qualifier
diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome.tests/src/org/eclipse/papyrus/infra/gmfdiag/welcome/tests/WelcomeModelElementTest.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome.tests/src/org/eclipse/papyrus/infra/gmfdiag/welcome/tests/WelcomeModelElementTest.java
index 9bfa0aa6be2..86b7d584fe1 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome.tests/src/org/eclipse/papyrus/infra/gmfdiag/welcome/tests/WelcomeModelElementTest.java
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome.tests/src/org/eclipse/papyrus/infra/gmfdiag/welcome/tests/WelcomeModelElementTest.java
@@ -34,11 +34,11 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram;
 import org.eclipse.papyrus.infra.editor.welcome.tests.AbstractWelcomePageTest;
 import org.eclipse.papyrus.infra.gmfdiag.welcome.internal.modelelements.NotationObservable;
 import org.eclipse.papyrus.infra.gmfdiag.welcome.internal.modelelements.WelcomeModelElement;
 import org.eclipse.papyrus.infra.gmfdiag.welcome.internal.modelelements.WelcomeModelElementFactory;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusDiagram;
 import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker;
 import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype;
 import org.eclipse.papyrus.junit.utils.rules.PluginResource;
@@ -202,9 +202,10 @@ public class WelcomeModelElementTest extends AbstractWelcomePageTest {
 			@Override
 			protected void doExecute() {
 				// Be resilient against misconfigured diagrams: look for the class diagram, specifically
-				ViewPrototype prototype = PolicyChecker.getCurrent().getPrototypesFor(editor.getModel()).stream()
-						.filter(proto -> proto.getConfiguration() instanceof PapyrusDiagram)
-						.filter(proto -> EcoreUtil.getURI(proto.getConfiguration()).toString().contains("org.eclipse.papyrus.uml.diagram.clazz"))
+				Collection<ViewPrototype> prototypes = PolicyChecker.getFor(editor.getModelSet()).getPrototypesFor(editor.getModel());
+				ViewPrototype prototype = prototypes.stream()
+						.filter(proto -> proto.getRepresentationKind() instanceof PapyrusDiagram)
+						.filter(proto -> proto.getRepresentationKind().getName().equals("Class Diagram"))
 						.findAny().get();
 				prototype.instantiateOn(editor.getModel(), "CreatedInTest");
 			}
diff --git a/tests/junit/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.tests/META-INF/MANIFEST.MF
index 7f16e8f512f..edd7e8cada4 100644
--- a/tests/junit/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/internationalization/org.eclipse.papyrus.infra.internationalization.tests/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.eclipse.papyrus.infra.core;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.infra.internationalization;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.ui.workbench;bundle-version="[3.109.0,4.0.0)",
+ org.eclipse.ui.workbench;bundle-version="[3.108.0,4.0.0)",
  org.eclipse.papyrus.infra.internationalization.common;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.papyrus.views.modelexplorer;bundle-version="[3.0.0,4.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common.tests/src/org/eclipse/papyrus/infra/nattable/common/tests/AbstractTableHelperAPITest.java b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common.tests/src/org/eclipse/papyrus/infra/nattable/common/tests/AbstractTableHelperAPITest.java
index 6be99ebd8c4..64099c8721e 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common.tests/src/org/eclipse/papyrus/infra/nattable/common/tests/AbstractTableHelperAPITest.java
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common.tests/src/org/eclipse/papyrus/infra/nattable/common/tests/AbstractTableHelperAPITest.java
@@ -19,6 +19,9 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.osgi.util.NLS;
+import org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind;
+import org.eclipse.papyrus.infra.nattable.representation.PapyrusSyncTable;
+import org.eclipse.papyrus.infra.nattable.representation.PapyrusTable;
 import org.eclipse.papyrus.infra.core.resource.NotFoundException;
 import org.eclipse.papyrus.infra.core.sashwindows.di.service.IPageManager;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
@@ -27,9 +30,6 @@ import org.eclipse.papyrus.infra.nattable.common.api.TableEditorCreationHelper;
 import org.eclipse.papyrus.infra.nattable.common.api.TableEditorDeleteHelper;
 import org.eclipse.papyrus.infra.nattable.common.api.TableEditorFinderHelper;
 import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusSyncTable;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusTable;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView;
 import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
 import org.eclipse.papyrus.junit.utils.rules.PapyrusEditorFixture;
 import org.junit.Assert;
@@ -228,7 +228,7 @@ public abstract class AbstractTableHelperAPITest extends AbstractPapyrusTest {
 		EObject proto = tableToCheck.getPrototype();
 
 		Assert.assertTrue(createAssertMessage("The view prototype seems not valid for a table", tableType), proto instanceof PapyrusSyncTable || proto instanceof PapyrusTable); //$NON-NLS-1$
-		String implementation = ((PapyrusView) proto).getImplementationID();
+		String implementation = ((PapyrusRepresentationKind) proto).getImplementationID();
 		if (implementation == null || implementation.isEmpty()) {
 			implementation = tableToCheck.getTableConfiguration().getType();
 		}
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/META-INF/MANIFEST.MF
index 7d799feec97..dc6b8fe3512 100755
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.suite.tests/META-INF/MANIFEST.MF
@@ -19,4 +19,3 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.nattable.model.tests;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.nattable.tests;bundle-version="1.2.0",
  org.eclipse.papyrus.editor.integration.tests;bundle-version="1.2.0"
- 
\ No newline at end of file
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/src/org/eclipse/papyrus/infra/nattable/tests/tests/TableLabelProviderTest.java b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/src/org/eclipse/papyrus/infra/nattable/tests/tests/TableLabelProviderTest.java
index 384b2586738..aa6a4e05ede 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/src/org/eclipse/papyrus/infra/nattable/tests/tests/TableLabelProviderTest.java
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.tests/src/org/eclipse/papyrus/infra/nattable/tests/tests/TableLabelProviderTest.java
@@ -17,17 +17,32 @@ import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assume.assumeThat;
 
+import java.util.Collections;
+
+import org.eclipse.emf.common.util.URI;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ILabelProviderListener;
 import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionLanguage;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureDomain;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureFactory;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionPreferences;
+import org.eclipse.papyrus.infra.core.architecture.ArchitectureViewpoint;
+import org.eclipse.papyrus.infra.architecture.ArchitectureDomainManager;
+import org.eclipse.papyrus.infra.architecture.ArchitectureDomainPreferences;
+import org.eclipse.papyrus.infra.architecture.ArchitectureDescriptionUtils;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.nattable.common.reconciler.TableVersioningUtils;
 import org.eclipse.papyrus.infra.nattable.model.nattable.NattableFactory;
 import org.eclipse.papyrus.infra.nattable.model.nattable.Table;
 import org.eclipse.papyrus.infra.nattable.provider.TableLabelProvider;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationFactory;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusTable;
+import org.eclipse.papyrus.infra.nattable.representation.PapyrusTable;
+import org.eclipse.papyrus.infra.nattable.representation.RepresentationFactory;
+import org.eclipse.papyrus.infra.services.edit.context.TypeContext;
 import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
 import org.eclipse.uml2.uml.Package;
 import org.eclipse.uml2.uml.UMLFactory;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -110,18 +125,40 @@ public class TableLabelProviderTest {
 	public void createFixture() {
 		fixture = houseKeeper.cleanUpLater(new TableLabelProvider());
 
-		package_ = UMLFactory.eINSTANCE.createPackage();
-		package_.setName("foo");
-
-		proto = ConfigurationFactory.eINSTANCE.createPapyrusTable();
+		ArchitectureDomain domain = ArchitectureFactory.eINSTANCE.createArchitectureDomain();
+		domain.setName("Testing");
+		
+		ArchitectureDescriptionLanguage language = ArchitectureFactory.eINSTANCE.createArchitectureDescriptionLanguage();
+		language.setId("Testing.TestTable");
+		domain.getContexts().add(language);
+		
+		proto = RepresentationFactory.eINSTANCE.createPapyrusTable();
 		proto.setName("Test Table");
 		proto.setImplementationID("org.eclipse.papyrus.infra.nattable.tests.TestTable");
 		proto.setConfiguration("TestTable");
+		language.getRepresentationKinds().add(proto);
+		
+		ArchitectureViewpoint viewpoint = ArchitectureFactory.eINSTANCE.createArchitectureViewpoint();
+		viewpoint.setId("tesing.TestTable.Testing");
+		viewpoint.getRepresentationKinds().add(proto);
+		language.getViewpoints().add(viewpoint);
+		
+		ArchitectureDomainManager.getInstance().getMerger().setDynamicDomains(Collections.singleton(domain));
+		ArchitectureDomainManager.getInstance().getPreferences().setDefaultContextId("Testing.TestTable");
+		
+		package_ = UMLFactory.eINSTANCE.createPackage();
+		package_.setName("foo");
 
 		table = NattableFactory.eINSTANCE.createTable();
+		TableVersioningUtils.stampCurrentVersion(table);
 		table.setName("classes");
 		table.setPrototype(proto);
 		table.setContext(package_);
 	}
 
+	@After
+	public void teardown() {
+		ArchitectureDomainManager.getInstance().getMerger().setDynamicDomains(Collections.emptyList());
+		ArchitectureDomainManager.getInstance().getPreferences().setDefaultContextId(TypeContext.getDefaultContextId());
+	}
 }
diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/META-INF/MANIFEST.MF
index 1d49e96a703..901710efb40 100755
--- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/META-INF/MANIFEST.MF
@@ -28,7 +28,6 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.gmfdiag.common.tests;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.gmfdiag.canonical.tests;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.emf.readonly.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.viewpoints.configuration.tests;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.editor.welcome.tests;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.gmfdiag.welcome.tests;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.properties.ui.tests;bundle-version="1.2.1", 
@@ -39,4 +38,3 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.gmfdiag.menu.tests;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.gmfdiag.css.tests;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.internationalization.tests;bundle-version="1.0.0"
- 
\ No newline at end of file
diff --git a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/test/org/eclipse/papyrus/infra/suite/tests/AllTests.java b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/test/org/eclipse/papyrus/infra/suite/tests/AllTests.java
index e08f06891bf..00dfa5ca847 100755
--- a/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/test/org/eclipse/papyrus/infra/suite/tests/AllTests.java
+++ b/tests/junit/plugins/infra/org.eclipse.papyrus.infra.suite.tests/test/org/eclipse/papyrus/infra/suite/tests/AllTests.java
@@ -56,7 +56,6 @@ public class AllTests {
 		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.gmfdiag.common.tests.AllTests.class));
 		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.gmfdiag.canonical.tests.AllTests.class));
 		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.emf.readonly.tests.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.viewpoints.configuration.tests.AllTests.class));
 		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.editor.welcome.tests.AllTests.class));
 		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.gmfdiag.welcome.tests.AllTests.class));
 		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.properties.ui.tests.AllTests.class));
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/META-INF/MANIFEST.MF
index c2cc6b9efb1..f93cf70fa4d 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.106.0",
  org.junit;bundle-version="4.11.0",
  org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.controlmode;bundle-version="1.3.0",
+ org.eclipse.papyrus.infra.services.controlmode;bundle-version="[1.5.0,2.0.0)",
  org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
  org.eclipse.papyrus.views.modelexplorer;bundle-version="1.2.0",
  org.eclipse.uml2.uml;bundle-version="5.0.0",
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/AbstractTestElementEditService.java b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/AbstractTestElementEditService.java
index 5ef068e73fd..b1f5665a0c7 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/AbstractTestElementEditService.java
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/AbstractTestElementEditService.java
@@ -1,146 +1,155 @@
-/*****************************************************************************

- * Copyright (c) 2012, 2016 CEA LIST, Christian W. Damus, and others.

- * 

- * 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

- *   Christian W. Damus - bug 485220

- *   

- *****************************************************************************/

-package org.eclipse.papyrus.infra.services.edit.tests;

-

-import static org.junit.Assert.fail;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.NullProgressMonitor;

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.emf.transaction.RunnableWithResult;

-import org.eclipse.gmf.runtime.emf.type.core.ClientContextManager;

-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;

-import org.eclipse.gmf.runtime.emf.type.core.IClientContext;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.MetamodelType;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditServiceProvider;

-import org.eclipse.papyrus.infra.services.edit.tests.edit.helper.EPackageEditHelper;

-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.ui.IEditorDescriptor;

-import org.eclipse.ui.IEditorPart;

-import org.eclipse.ui.IWorkbenchPage;

-import org.eclipse.ui.PlatformUI;

-import org.eclipse.ui.part.FileEditorInput;

-import org.junit.AfterClass;

-import org.junit.Assert;

-import org.junit.Before;

-import org.junit.BeforeClass;

-import org.osgi.framework.Bundle;

-import org.osgi.framework.FrameworkUtil;

-

-/**

- * Abstract Papyrus initialization class (required to get Service activation).

- */

-public abstract class AbstractTestElementEditService extends AbstractPapyrusTest {

-

-	private static Bundle testBundle;

-

-	protected static final String PAPYRUS_CONTEXT_ID = "org.eclipse.papyrus.infra.services.edit.TypeContext"; //$NON-NLS-1$

-

-	protected IElementType eClassType;

-

-	protected IElementType ePackgType;

-

-	protected IElementEditServiceProvider service;

-

-	protected static IEditorPart editor;

-

-	@BeforeClass

-	public static void openPapyrusWithAnEmptyProject() throws Exception {

-		// Prepare new project for tests

-		IProject testProject = ResourcesPlugin.getWorkspace().getRoot().getProject("TestProject");

-		if (!testProject.exists()) {

-			testProject.create(new NullProgressMonitor());

-		}

-		if (!testProject.isOpen()) {

-			testProject.open(new NullProgressMonitor());

-		}

-

-		// Copy EmptyModel from bundle to the test project

-		final IFile emptyModel_di = testProject.getFile("EmptyModel.di");

-		IFile emptyModel_no = testProject.getFile("EmptyModel.notation");

-		IFile emptyModel_uml = testProject.getFile("EmptyModel.uml");

-

-		emptyModel_di.create(getTestBundle().getResource("/model/EmptyModel.di").openStream(), true, new NullProgressMonitor());

-		emptyModel_no.create(getTestBundle().getResource("/model/EmptyModel.notation").openStream(), true, new NullProgressMonitor());

-		emptyModel_uml.create(getTestBundle().getResource("/model/EmptyModel.uml").openStream(), true, new NullProgressMonitor());

-

-		// Open the EmptyModel.di file with Papyrus (assumed to be the default editor for "di" files here).

-		Display.getDefault().syncExec(new Runnable() {

-

-			public void run() {

-				IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();

-				IEditorDescriptor desc = PlatformUI.getWorkbench().getEditorRegistry().getDefaultEditor(emptyModel_di.getName());

-				try {

-					editor = page.openEditor(new FileEditorInput(emptyModel_di), desc.getId());

-				} catch (Exception ex) {

-					ex.printStackTrace(System.out);

-				}

-			}

-		});

-

-		Assert.assertNotNull(editor);

-	}

-

-	protected static Bundle getTestBundle() {

-		if (testBundle == null) {

-			testBundle = FrameworkUtil.getBundle(AbstractTestElementEditService.class);

-		}

-		return testBundle;

-	}

-

-	@Before

-	public void setUp() {

-		// To prepare this test two element types are added to Papyrus Client Context

-		ElementTypeRegistry.getInstance().register(new MetamodelType("ECLASS_TEST_ID", null, "ECLASS", EcorePackage.eINSTANCE.getEClass(), null)); //$NON-NLS-1$

-		ElementTypeRegistry.getInstance().register(new MetamodelType("EPACKG_TEST_ID", null, "EPACKG", EcorePackage.eINSTANCE.getEPackage(), new EPackageEditHelper())); //$NON-NLS-1$

-

-		eClassType = ElementTypeRegistry.getInstance().getType("ECLASS_TEST_ID");

-		ePackgType = ElementTypeRegistry.getInstance().getType("EPACKG_TEST_ID");

-

-		IClientContext context = ClientContextManager.getInstance().getClientContext(PAPYRUS_CONTEXT_ID);

-		context.bindId("ECLASS_TEST_ID"); //$NON-NLS-1$

-		context.bindId("EPACKG_TEST_ID"); //$NON-NLS-1$

-

-		service = ElementEditServiceUtils.getEditServiceProvider();

-	}

-

-	@AfterClass

-	public static void closePapyrusAndCleanProject() {

-		RunnableWithResult<Boolean> closeEditorsRunnable;

-		Display.getDefault().syncExec(closeEditorsRunnable = new RunnableWithResult.Impl<Boolean>() {

-

-			public void run() {

-				setResult(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().closeAllEditors(false));

-			}

-		});

-		editor = null;

-

-		// Close all editors

-		Assert.assertTrue("Could not close editors correctly.", closeEditorsRunnable.getResult());

-

-		// Delete test project

-		IProject testProject = ResourcesPlugin.getWorkspace().getRoot().getProject("TestProject");

-		try {

-			testProject.delete(true, new NullProgressMonitor());

-		} catch (CoreException e) {

-			fail("Could delete test project correctly (" + e.getMessage() + ").");

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2012, 2016 CEA LIST, Christian W. Damus, and others.
+ * 
+ * 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
+ *   Christian W. Damus - bug 485220
+ *   
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.edit.tests;
+
+import static org.junit.Assert.fail;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.transaction.RunnableWithResult;
+import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
+import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.MetamodelType;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.services.edit.context.TypeContext;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditServiceProvider;
+import org.eclipse.papyrus.infra.services.edit.tests.edit.helper.EPackageEditHelper;
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IEditorDescriptor;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.part.FileEditorInput;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.FrameworkUtil;
+
+/**
+ * Abstract Papyrus initialization class (required to get Service activation).
+ */
+public abstract class AbstractTestElementEditService extends AbstractPapyrusTest {
+
+	private static Bundle testBundle;
+
+	protected IElementType eClassType;
+
+	protected IElementType ePackgType;
+
+	protected IClientContext context;
+
+	protected IElementEditServiceProvider provider;
+
+	protected static IEditorPart editor;
+
+	@BeforeClass
+	public static void openPapyrusWithAnEmptyProject() throws Exception {
+		// Prepare new project for tests
+		IProject testProject = ResourcesPlugin.getWorkspace().getRoot().getProject("TestProject");
+		if (!testProject.exists()) {
+			testProject.create(new NullProgressMonitor());
+		}
+		if (!testProject.isOpen()) {
+			testProject.open(new NullProgressMonitor());
+		}
+
+		// Copy EmptyModel from bundle to the test project
+		final IFile emptyModel_di = testProject.getFile("EmptyModel.di");
+		IFile emptyModel_no = testProject.getFile("EmptyModel.notation");
+		IFile emptyModel_uml = testProject.getFile("EmptyModel.uml");
+
+		emptyModel_di.create(getTestBundle().getResource("/model/EmptyModel.di").openStream(), true, new NullProgressMonitor());
+		emptyModel_no.create(getTestBundle().getResource("/model/EmptyModel.notation").openStream(), true, new NullProgressMonitor());
+		emptyModel_uml.create(getTestBundle().getResource("/model/EmptyModel.uml").openStream(), true, new NullProgressMonitor());
+
+		// Open the EmptyModel.di file with Papyrus (assumed to be the default editor for "di" files here).
+		Display.getDefault().syncExec(new Runnable() {
+
+			public void run() {
+				IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
+				IEditorDescriptor desc = PlatformUI.getWorkbench().getEditorRegistry().getDefaultEditor(emptyModel_di.getName());
+				try {
+					editor = page.openEditor(new FileEditorInput(emptyModel_di), desc.getId());
+				} catch (Exception ex) {
+					ex.printStackTrace(System.out);
+				}
+			}
+		});
+
+		Assert.assertNotNull(editor);
+	}
+
+	protected static Bundle getTestBundle() {
+		if (testBundle == null) {
+			testBundle = FrameworkUtil.getBundle(AbstractTestElementEditService.class);
+		}
+		return testBundle;
+	}
+
+	@Before
+	public void setUp() {
+		// To prepare this test two element types are added to Papyrus Client Context
+		ElementTypeRegistry.getInstance().register(new MetamodelType("ECLASS_TEST_ID", null, "ECLASS", EcorePackage.eINSTANCE.getEClass(), null)); //$NON-NLS-1$
+		ElementTypeRegistry.getInstance().register(new MetamodelType("EPACKG_TEST_ID", null, "EPACKG", EcorePackage.eINSTANCE.getEPackage(), new EPackageEditHelper())); //$NON-NLS-1$
+
+		eClassType = ElementTypeRegistry.getInstance().getType("ECLASS_TEST_ID");
+		ePackgType = ElementTypeRegistry.getInstance().getType("EPACKG_TEST_ID");
+
+		try {
+			context = TypeContext.getDefaultContext();
+			context.bindId("ECLASS_TEST_ID"); //$NON-NLS-1$
+			context.bindId("EPACKG_TEST_ID"); //$NON-NLS-1$
+		} catch (ServiceException e) {
+			fail("Default client context is not found");
+			return;
+		}
+
+		provider = ElementEditServiceUtils.getEditServiceProvider(context);
+		if(provider == null) {
+			fail("Element edit service can not be found.");
+		}
+	}
+
+	@AfterClass
+	public static void closePapyrusAndCleanProject() {
+		RunnableWithResult<Boolean> closeEditorsRunnable;
+		Display.getDefault().syncExec(closeEditorsRunnable = new RunnableWithResult.Impl<Boolean>() {
+
+			public void run() {
+				setResult(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().closeAllEditors(false));
+			}
+		});
+		editor = null;
+
+		// Close all editors
+		Assert.assertTrue("Could not close editors correctly.", closeEditorsRunnable.getResult());
+
+		// Delete test project
+		IProject testProject = ResourcesPlugin.getWorkspace().getRoot().getProject("TestProject");
+		try {
+			testProject.delete(true, new NullProgressMonitor());
+		} catch (CoreException e) {
+			fail("Could delete test project correctly (" + e.getMessage() + ").");
+		}
+	}
+}
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/commands/TestConfigureFeatureCommandFactory.java b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/commands/TestConfigureFeatureCommandFactory.java
index 2ce2df43f6b..e4c054b4c7e 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/commands/TestConfigureFeatureCommandFactory.java
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/commands/TestConfigureFeatureCommandFactory.java
@@ -1,69 +1,68 @@
-package org.eclipse.papyrus.infra.services.edit.tests.commands;

-

-import static org.junit.Assert.assertTrue;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.NullProgressMonitor;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EcoreFactory;

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.ClientContextManager;

-import org.eclipse.gmf.runtime.emf.type.core.IClientContext;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.services.edit.commands.ConfigureFeatureCommandFactory;

-import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;

-import org.eclipse.papyrus.infra.services.edit.internal.ElementEditService;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.infra.services.edit.tests.AbstractTestElementEditService;

-import org.junit.Before;

-import org.junit.Test;

-

-/**

- * JUnit tests for {@link ConfigureFeatureCommandFactory} class.

- */

-public class TestConfigureFeatureCommandFactory extends AbstractTestElementEditService {

-

-	IClientContext context;

-

-	IElementEditService ePckgService;

-

-	EPackage ePckg;

-

-	@Override

-	@Before

-	public void setUp() {

-		super.setUp();

-

-		context = ClientContextManager.getInstance().getClientContext(PAPYRUS_CONTEXT_ID);

-		ePckgService = new ElementEditService(ePackgType, context);

-		ePckg = EcoreFactory.eINSTANCE.createEPackage();

-	}

-

-	@Test

-	public void testGetEditCommand() throws ServiceException, ExecutionException {

-		ICommand correctCommand = ePckgService.getEditCommand(prepareCorrectRequest());

-

-		// Try to execute command and make quick result verification.

-		assertTrue("The service command should be executable.", correctCommand.canExecute());

-		correctCommand.execute(new NullProgressMonitor(), null);

-		assertTrue("The service command result is incorrect.", !ePckg.getESubpackages().isEmpty());

-		assertTrue("The service configure command result is incorrect.", "ASpecificName".equals(ePckg.getESubpackages().get(0).getName()));

-	}

-

-	/** Prepare a creation request (create a EPackage in an EPackage) and adds a ConfigureFeatureCommand */

-	@SuppressWarnings("unchecked")

-	private IEditCommandRequest prepareCorrectRequest() throws ServiceException {

-		TransactionalEditingDomain editingDomain = (TransactionalEditingDomain)editor.getAdapter(TransactionalEditingDomain.class);

-		IEditCommandRequest request = new CreateElementRequest(editingDomain, ePckg, ePackgType);

-

-		// Create a configure command factory and add it to the request

-		IConfigureCommandFactory factory = new ConfigureFeatureCommandFactory(EcorePackage.eINSTANCE.getENamedElement_Name(), "ASpecificName");

-		request.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, factory);

-

-		return request;

-	}

-}

+package org.eclipse.papyrus.infra.services.edit.tests.commands;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EcoreFactory;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.services.edit.commands.ConfigureFeatureCommandFactory;
+import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.infra.services.edit.tests.AbstractTestElementEditService;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * JUnit tests for {@link ConfigureFeatureCommandFactory} class.
+ */
+public class TestConfigureFeatureCommandFactory extends AbstractTestElementEditService {
+
+	IElementEditService ePckgService;
+
+	EPackage ePckg;
+
+	@Override
+	@Before
+	public void setUp() {
+		super.setUp();
+
+		try {
+			ePckgService = provider.getEditService(ePackgType);
+		} catch (ServiceException e) {
+			fail("failed to get the edit service for "+ePackgType);
+		}
+		ePckg = EcoreFactory.eINSTANCE.createEPackage();
+	}
+
+	@Test
+	public void testGetEditCommand() throws ServiceException, ExecutionException {
+		ICommand correctCommand = ePckgService.getEditCommand(prepareCorrectRequest());
+
+		// Try to execute command and make quick result verification.
+		assertTrue("The service command should be executable.", correctCommand.canExecute());
+		correctCommand.execute(new NullProgressMonitor(), null);
+		assertTrue("The service command result is incorrect.", !ePckg.getESubpackages().isEmpty());
+		assertTrue("The service configure command result is incorrect.", "ASpecificName".equals(ePckg.getESubpackages().get(0).getName()));
+	}
+
+	/** Prepare a creation request (create a EPackage in an EPackage) and adds a ConfigureFeatureCommand */
+	@SuppressWarnings("unchecked")
+	private IEditCommandRequest prepareCorrectRequest() throws ServiceException {
+		TransactionalEditingDomain editingDomain = (TransactionalEditingDomain)editor.getAdapter(TransactionalEditingDomain.class);
+		IEditCommandRequest request = new CreateElementRequest(editingDomain, ePckg, ePackgType);
+
+		// Create a configure command factory and add it to the request
+		IConfigureCommandFactory factory = new ConfigureFeatureCommandFactory(EcorePackage.eINSTANCE.getENamedElement_Name(), "ASpecificName");
+		request.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, factory);
+
+		return request;
+	}
+}
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/commands/TestConfigureFeatureListCommandFactory.java b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/commands/TestConfigureFeatureListCommandFactory.java
index 482b9adc61b..fd5b49cf6a7 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/commands/TestConfigureFeatureListCommandFactory.java
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/commands/TestConfigureFeatureListCommandFactory.java
@@ -1,78 +1,78 @@
-package org.eclipse.papyrus.infra.services.edit.tests.commands;

-

-import static org.junit.Assert.assertTrue;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.NullProgressMonitor;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.ecore.EcoreFactory;

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.ClientContextManager;

-import org.eclipse.gmf.runtime.emf.type.core.IClientContext;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.services.edit.commands.ConfigureFeatureListCommandFactory;

-import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;

-import org.eclipse.papyrus.infra.services.edit.internal.ElementEditService;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.infra.services.edit.tests.AbstractTestElementEditService;

-import org.junit.Before;

-import org.junit.Test;

-

-/**

- * JUnit tests for {@link ConfigureFeatureListCommandFactory} class.

- */

-public class TestConfigureFeatureListCommandFactory extends AbstractTestElementEditService {

-

-	IClientContext context;

-

-	IElementEditService ePckgService;

-

-	EPackage ePckg;

-

-	@Override

-	@Before

-	public void setUp() {

-		super.setUp();

-

-		context = ClientContextManager.getInstance().getClientContext(PAPYRUS_CONTEXT_ID);

-		ePckgService = new ElementEditService(ePackgType, context);

-		ePckg = EcoreFactory.eINSTANCE.createEPackage();

-	}

-

-	@Test

-	public void testGetEditCommand() throws ServiceException, ExecutionException {

-		ICommand correctCommand = ePckgService.getEditCommand(prepareCorrectRequest());

-

-		// Try to execute command and make quick result verification.

-		assertTrue("The service command should be executable.", correctCommand.canExecute());

-		correctCommand.execute(new NullProgressMonitor(), null);

-		assertTrue("The service command result is incorrect.", !ePckg.getESubpackages().isEmpty());

-		assertTrue("The service configure command result is incorrect.", "ASpecificName".equals(ePckg.getESubpackages().get(0).getName()));

-		assertTrue("The service configure command result is incorrect.", "ASpecificNsURI".equals(ePckg.getESubpackages().get(0).getNsURI()));

-	}

-

-	/** Prepare a creation request (create a EPackage in an EPackage) and adds a ConfigureFeatureCommand */

-	@SuppressWarnings("unchecked")

-	private IEditCommandRequest prepareCorrectRequest() throws ServiceException {

-		TransactionalEditingDomain editingDomain = (TransactionalEditingDomain)editor.getAdapter(TransactionalEditingDomain.class);

-		IEditCommandRequest request = new CreateElementRequest(editingDomain, ePckg, ePackgType);

-

-		// Create a configure command factory and add it to the request

-		Map<EStructuralFeature, Object> featureValueMap = new HashMap<EStructuralFeature, Object>();

-		featureValueMap.put(EcorePackage.eINSTANCE.getENamedElement_Name(), "ASpecificName");

-		featureValueMap.put(EcorePackage.eINSTANCE.getEPackage_NsURI(), "ASpecificNsURI");

-

-		IConfigureCommandFactory factory = new ConfigureFeatureListCommandFactory(featureValueMap);

-		request.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, factory);

-

-		return request;

-	}

-}

+package org.eclipse.papyrus.infra.services.edit.tests.commands;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.EcoreFactory;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.services.edit.commands.ConfigureFeatureListCommandFactory;
+import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
+import org.eclipse.papyrus.infra.services.edit.internal.ElementEditService;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.infra.services.edit.tests.AbstractTestElementEditService;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * JUnit tests for {@link ConfigureFeatureListCommandFactory} class.
+ */
+public class TestConfigureFeatureListCommandFactory extends AbstractTestElementEditService {
+
+	IElementEditService ePckgService;
+
+	EPackage ePckg;
+
+	@Override
+	@Before
+	public void setUp() {
+		super.setUp();
+
+		try {
+			ePckgService = provider.getEditService(ePackgType);
+		} catch (ServiceException e) {
+			fail("failed to get the edit service for "+ePackgType);
+		}
+		ePckg = EcoreFactory.eINSTANCE.createEPackage();
+	}
+
+	@Test
+	public void testGetEditCommand() throws ServiceException, ExecutionException {
+		ICommand correctCommand = ePckgService.getEditCommand(prepareCorrectRequest());
+
+		// Try to execute command and make quick result verification.
+		assertTrue("The service command should be executable.", correctCommand.canExecute());
+		correctCommand.execute(new NullProgressMonitor(), null);
+		assertTrue("The service command result is incorrect.", !ePckg.getESubpackages().isEmpty());
+		assertTrue("The service configure command result is incorrect.", "ASpecificName".equals(ePckg.getESubpackages().get(0).getName()));
+		assertTrue("The service configure command result is incorrect.", "ASpecificNsURI".equals(ePckg.getESubpackages().get(0).getNsURI()));
+	}
+
+	/** Prepare a creation request (create a EPackage in an EPackage) and adds a ConfigureFeatureCommand */
+	@SuppressWarnings("unchecked")
+	private IEditCommandRequest prepareCorrectRequest() throws ServiceException {
+		TransactionalEditingDomain editingDomain = (TransactionalEditingDomain)editor.getAdapter(TransactionalEditingDomain.class);
+		IEditCommandRequest request = new CreateElementRequest(editingDomain, ePckg, ePackgType);
+
+		// Create a configure command factory and add it to the request
+		Map<EStructuralFeature, Object> featureValueMap = new HashMap<EStructuralFeature, Object>();
+		featureValueMap.put(EcorePackage.eINSTANCE.getENamedElement_Name(), "ASpecificName");
+		featureValueMap.put(EcorePackage.eINSTANCE.getEPackage_NsURI(), "ASpecificNsURI");
+
+		IConfigureCommandFactory factory = new ConfigureFeatureListCommandFactory(featureValueMap);
+		request.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, factory);
+
+		return request;
+	}
+}
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/context/TestClientContext.java b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/context/TestClientContext.java
index 09b8e037b18..0cf4d1c25e5 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/context/TestClientContext.java
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/context/TestClientContext.java
@@ -1,25 +1,24 @@
-package org.eclipse.papyrus.infra.services.edit.tests.context;

-

-import static org.junit.Assert.fail;

-

-import org.eclipse.gmf.runtime.emf.type.core.ClientContextManager;

-import org.eclipse.gmf.runtime.emf.type.core.IClientContext;

-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;

-import org.junit.Test;

-

-/**

- * JUnit tests Papyrus ElementTypeRegistry binding context.

- */

-public class TestClientContext extends AbstractPapyrusTest {

-

-	private static final String PAPYRUS_CONTEXT_ID = "org.eclipse.papyrus.infra.services.edit.TypeContext"; //$NON-NLS-1$

-

-	@Test

-	public void testClientContextExist() {

-		IClientContext context = ClientContextManager.getInstance().getClientContext(PAPYRUS_CONTEXT_ID);

-		if(context == null) {

-			fail("Papyrus IClientContext could not be found.");

-		}

-	}

-

-}

+package org.eclipse.papyrus.infra.services.edit.tests.context;
+
+import static org.junit.Assert.fail;
+
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.services.edit.context.TypeContext;
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.junit.Test;
+
+/**
+ * JUnit tests Papyrus ElementTypeRegistry binding context.
+ */
+public class TestClientContext extends AbstractPapyrusTest {
+
+	@Test
+	public void testClientContextExist() {
+		try {
+			TypeContext.getDefaultContext();
+		} catch (ServiceException e) {
+			fail("Papyrus IClientContext could not be found.");
+		}
+	}
+
+}
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/service/TestElementEditService.java b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/service/TestElementEditService.java
index 236d9133dd4..85507cff575 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/service/TestElementEditService.java
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/service/TestElementEditService.java
@@ -1,116 +1,118 @@
-package org.eclipse.papyrus.infra.services.edit.tests.service;

-

-import static org.junit.Assert.assertFalse;

-import static org.junit.Assert.assertTrue;

-import static org.junit.Assert.fail;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.NullProgressMonitor;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EcoreFactory;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.ClientContextManager;

-import org.eclipse.gmf.runtime.emf.type.core.IClientContext;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.services.edit.internal.ElementEditService;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.infra.services.edit.tests.AbstractTestElementEditService;

-import org.junit.Before;

-import org.junit.Test;

-

-/**

- * JUnit tests for {@link ElementEditService} class.

- */

-public class TestElementEditService extends AbstractTestElementEditService {

-

-	// IElementType declared for testing purpose in super class:

-	// MetamodelType("ECLASS_TEST_ID", null, "ECLASS", EcorePackage.eINSTANCE.getEClass(), null); //$NON-NLS-1$

-	// MetamodelType("EPACKG_TEST_ID", null, "EPACKG", EcorePackage.eINSTANCE.getEPackage(), null); //$NON-NLS-1$

-

-	IClientContext context;

-

-	IElementEditService ePckgService;

-

-	IElementEditService eClassService;

-

-	EPackage ePckg;

-

-	EClass eClass;

-

-	@Override

-	@Before

-	public void setUp() {

-		super.setUp();

-

-		context = ClientContextManager.getInstance().getClientContext(PAPYRUS_CONTEXT_ID);

-

-		ePckgService = new ElementEditService(ePackgType, context);

-		eClassService = new ElementEditService(eClassType, context);

-

-		ePckg = EcoreFactory.eINSTANCE.createEPackage();

-		eClass = EcoreFactory.eINSTANCE.createEClass();

-	}

-

-	@Test

-	public void testCanEdit() {

-		try {

-			assertTrue("The service should be able to edit the request.", ePckgService.canEdit(prepareCorrectRequest()));

-			assertFalse("The service should not be able to edit the request.", ePckgService.canEdit(prepareIncorrectRequest()));

-		} catch (ServiceException e) {

-			fail("Test aborted - Papyrus editing domain not found.");

-		}

-	}

-

-	@Test

-	public void testGetEditCommand() {

-		try {

-

-			ICommand correctCommand = ePckgService.getEditCommand(prepareCorrectRequest());

-			ICommand incorrectCommand = ePckgService.getEditCommand(prepareIncorrectRequest());

-

-			// Try to execute command and make quick result verification.

-			assertTrue("The service command should be executable.", correctCommand.canExecute());

-			correctCommand.execute(new NullProgressMonitor(), null);

-			assertTrue("The service command result is incorrect.", !ePckg.getESubpackages().isEmpty());

-

-			// With incorrect request the command should not be executable. 

-			assertFalse("The service command should not be executable.", incorrectCommand.canExecute());

-

-		} catch (ServiceException e) {

-			e.printStackTrace(System.out);

-			fail("Test aborted - Papyrus editing domain not found.");

-		} catch (ExecutionException e) {

-			e.printStackTrace(System.out);

-			fail("Test aborted - Command execution failed.");

-		}

-	}

-

-	@Test

-	public void testGetDisplayName() {

-		String displayName = ePckgService.getDisplayName();

-		assertTrue("Incorrect display name retrieved.", displayName.equals("EPACKG"));

-	}

-

-	@Test

-	public void testGetAdapter() {

-		IElementType type = (IElementType)ePckgService.getAdapter(IElementType.class);

-		assertTrue("Incorrect type adaptation.", type == ePackgType);

-	}

-

-	/** Correct creation request (create a EPackage in an EPackage) */

-	private IEditCommandRequest prepareCorrectRequest() throws ServiceException {

-		TransactionalEditingDomain editingDomain = (TransactionalEditingDomain)editor.getAdapter(TransactionalEditingDomain.class);

-		return new CreateElementRequest(editingDomain, ePckg, ePackgType);

-	}

-

-	/** Incorrect creation request (create a EClass in an EPackage) */

-	private IEditCommandRequest prepareIncorrectRequest() throws ServiceException {

-		TransactionalEditingDomain editingDomain = (TransactionalEditingDomain)editor.getAdapter(TransactionalEditingDomain.class);

-		return new CreateElementRequest(editingDomain, eClass, ePackgType);

-	}

-}

+package org.eclipse.papyrus.infra.services.edit.tests.service;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EcoreFactory;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.services.edit.internal.ElementEditService;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.infra.services.edit.tests.AbstractTestElementEditService;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * JUnit tests for {@link ElementEditService} class.
+ */
+public class TestElementEditService extends AbstractTestElementEditService {
+
+	// IElementType declared for testing purpose in super class:
+	// MetamodelType("ECLASS_TEST_ID", null, "ECLASS", EcorePackage.eINSTANCE.getEClass(), null); //$NON-NLS-1$
+	// MetamodelType("EPACKG_TEST_ID", null, "EPACKG", EcorePackage.eINSTANCE.getEPackage(), null); //$NON-NLS-1$
+
+	IElementEditService ePckgService;
+
+	IElementEditService eClassService;
+
+	EPackage ePckg;
+
+	EClass eClass;
+
+	@Override
+	@Before
+	public void setUp() {
+		super.setUp();
+
+		try {
+			ePckgService = provider.getEditService(ePackgType);
+		} catch (ServiceException e) {
+			fail("failed to get the edit service for "+ePackgType);
+		}
+		try {
+			eClassService = provider.getEditService(eClassType);
+		} catch (ServiceException e) {
+			fail("failed to get the edit service for "+eClassType);
+		}
+
+		ePckg = EcoreFactory.eINSTANCE.createEPackage();
+		eClass = EcoreFactory.eINSTANCE.createEClass();
+	}
+
+	@Test
+	public void testCanEdit() {
+		try {
+			assertTrue("The service should be able to edit the request.", ePckgService.canEdit(prepareCorrectRequest()));
+			assertFalse("The service should not be able to edit the request.", ePckgService.canEdit(prepareIncorrectRequest()));
+		} catch (ServiceException e) {
+			fail("Test aborted - Papyrus editing domain not found.");
+		}
+	}
+
+	@Test
+	public void testGetEditCommand() {
+		try {
+
+			ICommand correctCommand = ePckgService.getEditCommand(prepareCorrectRequest());
+			ICommand incorrectCommand = ePckgService.getEditCommand(prepareIncorrectRequest());
+
+			// Try to execute command and make quick result verification.
+			assertTrue("The service command should be executable.", correctCommand.canExecute());
+			correctCommand.execute(new NullProgressMonitor(), null);
+			assertTrue("The service command result is incorrect.", !ePckg.getESubpackages().isEmpty());
+
+			// With incorrect request the command should not be executable. 
+			assertFalse("The service command should not be executable.", incorrectCommand.canExecute());
+
+		} catch (ServiceException e) {
+			e.printStackTrace(System.out);
+			fail("Test aborted - Papyrus editing domain not found.");
+		} catch (ExecutionException e) {
+			e.printStackTrace(System.out);
+			fail("Test aborted - Command execution failed.");
+		}
+	}
+
+	@Test
+	public void testGetDisplayName() {
+		String displayName = ePckgService.getDisplayName();
+		assertTrue("Incorrect display name retrieved.", displayName.equals("EPACKG"));
+	}
+
+	@Test
+	public void testGetAdapter() {
+		IElementType type = (IElementType)ePckgService.getAdapter(IElementType.class);
+		assertTrue("Incorrect type adaptation.", type == ePackgType);
+	}
+
+	/** Correct creation request (create a EPackage in an EPackage) */
+	private IEditCommandRequest prepareCorrectRequest() throws ServiceException {
+		TransactionalEditingDomain editingDomain = (TransactionalEditingDomain)editor.getAdapter(TransactionalEditingDomain.class);
+		return new CreateElementRequest(editingDomain, ePckg, ePackgType);
+	}
+
+	/** Incorrect creation request (create a EClass in an EPackage) */
+	private IEditCommandRequest prepareIncorrectRequest() throws ServiceException {
+		TransactionalEditingDomain editingDomain = (TransactionalEditingDomain)editor.getAdapter(TransactionalEditingDomain.class);
+		return new CreateElementRequest(editingDomain, eClass, ePackgType);
+	}
+}
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/service/TestElementEditServiceProvider.java b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/service/TestElementEditServiceProvider.java
index ee5e3b39d54..c5ae8863eb0 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/service/TestElementEditServiceProvider.java
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/service/TestElementEditServiceProvider.java
@@ -1,164 +1,148 @@
-package org.eclipse.papyrus.infra.services.edit.tests.service;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertFalse;

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertNull;

-import static org.junit.Assert.assertTrue;

-import static org.junit.Assert.fail;

-

-import java.util.List;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EcoreFactory;

-import org.eclipse.emf.ecore.EcorePackage;

-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.IMetamodelType;

-import org.eclipse.gmf.runtime.emf.type.core.MetamodelType;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.services.edit.internal.ElementEditServiceProvider;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditServiceProvider;

-import org.eclipse.papyrus.infra.services.edit.tests.AbstractTestElementEditService;

-import org.junit.Before;

-import org.junit.Test;

-

-/**

- * JUnit tests for {@link ElementEditServiceProvider} class.

- */

-public class TestElementEditServiceProvider extends AbstractTestElementEditService {

-

-	IElementEditServiceProvider provider;

-

-	@Override

-	@Before

-	public void setUp() {

-		super.setUp();

-

-		try {

-			provider = ElementEditServiceProvider.getInstance();

-		} catch (ServiceException e) {

-			fail("Test aborted - Singleton IElementEditServiceProvider not found.");

-		}

-	}

-

-	@Test

-	public void testGetEditService_EClass() {

-

-		try {

-			IElementEditService attService = provider.getEditService(EcorePackage.eINSTANCE.getEAttribute());

-			assertNotNull("No IElementEditService found for EAttribute.", attService);

-			String attServiceDisplayName = attService.getDisplayName();

-			assertEquals("Default IElementEditService should match EAttribute.", "EObject", attServiceDisplayName); //There is an EObject element type introduced in infra.emf

-

-			IElementEditService packService = provider.getEditService(EcorePackage.eINSTANCE.getEPackage());

-			assertNotNull("No IElementEditService found for EPackage.", packService);

-			// Check result

-			assertEquals("The IElementEditService should be EPackage related.", "EPACKG", packService.getDisplayName());

-

-		} catch (ServiceException e) {

-			fail("Test aborted - Service exception in ElementEditServiceProvider::getEditService(EClass).");

-		}

-	}

-

-	@Test

-	public void testGetEditService_EObject() {

-

-		try {

-			EAttribute att = EcoreFactory.eINSTANCE.createEAttribute();

-			EPackage pack = EcoreFactory.eINSTANCE.createEPackage();

-

-			IElementEditService attService = provider.getEditService(att);

-			assertNotNull("No IElementEditService found for EAttribute.", attService);

-			String attServiceDisplayName = attService.getDisplayName();

-			assertEquals("Default IElementEditService should match EAttribute.", "EObject", attServiceDisplayName); //There is an EObject element type introduced in infra.emf

-

-			IElementEditService packService = provider.getEditService(pack);

-			assertNotNull("No IElementEditService found for EPackage.", packService);

-

-			// Check result

-			assertEquals("The IElementEditService should be EPackage related.", "EPACKG", packService.getDisplayName());

-

-		} catch (ServiceException e) {

-			fail("Test aborted - Service exception in ElementEditServiceProvider::getEditService(EObject).");

-		}

-	}

-

-	@Test

-	public void testGetEditService_IElementType() {

-

-		try {

-

-			IElementEditService packService = provider.getEditService(ePackgType);

-			assertNotNull("No IElementEditService found for EPackage.", packService);

-			// Check result

-			assertEquals("The IElementEditService should be EPackage related.", "EPACKG", packService.getDisplayName());

-

-		} catch (ServiceException e) {

-			fail("Test aborted - Service exception in ElementEditServiceProvider::getEditService(EObject).");

-		}

-

-		try {

-

-			ElementTypeRegistry.getInstance().register(new MetamodelType("ETT_TEST_ID", null, "EATT", EcorePackage.eINSTANCE.getEAttribute(), null)); //$NON-NLS-1$

-			IElementType eAtt = ElementTypeRegistry.getInstance().getType("ETT_TEST_ID");

-			IElementEditService attService = provider.getEditService(eAtt);

-			assertNull("No IElementEditService should match EAttribute.", attService);

-

-		} catch (ServiceException e) {

-			// Exception expected.

-			return;

-		}

-

-		fail("The service is supposed to thow exception when the IElementType is incorrect.");

-	}

-

-	@Test

-	public void testGetEditService_Unknown() {

-		try {

-			provider.getEditService("Incorrect_Object");

-		} catch (ServiceException e) {

-			// An exception should be thrown

-			return;

-		}

-

-		fail("No exception thrown will the object cannot be handled.");

-	}

-

-	@Test

-	public void testGetContainedTypeEditServices() {

-		EPackage aPackage = EcoreFactory.eINSTANCE.createEPackage();

-		EClass aClass = EcoreFactory.eINSTANCE.createEClass();

-

-		try {

-			List<IElementEditService> package_ESubpackages = provider.getContainedTypeEditServices(aPackage, EcorePackage.eINSTANCE.getEPackage_ESubpackages());

-			assertEquals("Only 1 IElementEditService should match EcorePackage.eINSTANCE.getEPackage_ESubpackages()", 1, package_ESubpackages.size());

-

-			// Check result

-			IElementEditService service = package_ESubpackages.get(0);

-			assertTrue("The IElementEditService should be EPackage related.", service.getDisplayName().equals("EPACKG"));

-

-			List<IElementEditService> class_EOperations = provider.getContainedTypeEditServices(aClass, EcorePackage.eINSTANCE.getEClass_EOperations());

-			assertEquals("The default IElementEditService should match EcorePackage.eINSTANCE.getEClass_EOperations()", 1, class_EOperations.size());

-			assertEquals("The default IElementEditService should match EcorePackage.eINSTANCE.getEClass_EOperations()", "EObject", class_EOperations.get(0).getDisplayName());

-

-		} catch (ServiceException e) {

-			fail("Test aborted - Service exception in ElementEditServiceProvider::getContainedTypeEditServices.");

-		}

-	}

-

-	@Test

-	public void testIsKnownElementType() {

-		assertFalse("Current IElementType id should not be known.", provider.isKnownElementType("unknown_id"));

-		assertTrue("Current IElementType id should be known.", provider.isKnownElementType(eClassType.getId()));

-

-		// Add an IElementType, not bound to Papyrus context - Should be considered as ignored

-		IMetamodelType eAttr = new MetamodelType("out_of_context_id", null, "EATTR", EcorePackage.eINSTANCE.getEAttribute(), null); //$NON-NLS-1$

-		ElementTypeRegistry.getInstance().register(eAttr);

-

-		assertFalse("Current IElementType id should not be known.", provider.isKnownElementType(eAttr.getId()));

-	}

-}

+package org.eclipse.papyrus.infra.services.edit.tests.service;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.List;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EcoreFactory;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.IMetamodelType;
+import org.eclipse.gmf.runtime.emf.type.core.MetamodelType;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.services.edit.internal.ElementEditServiceProvider;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.infra.services.edit.tests.AbstractTestElementEditService;
+import org.junit.Test;
+
+/**
+ * JUnit tests for {@link ElementEditServiceProvider} class.
+ */
+public class TestElementEditServiceProvider extends AbstractTestElementEditService {
+
+	@Test
+	public void testGetEditService_EClass() {
+
+		try {
+			IElementEditService attService = provider.getEditService(EcorePackage.eINSTANCE.getEAttribute());
+			assertNotNull("No IElementEditService found for EAttribute.", attService);
+			String attServiceDisplayName = attService.getDisplayName();
+			assertEquals("Default IElementEditService should match EAttribute.", "EObject", attServiceDisplayName); //There is an EObject element type introduced in infra.emf
+
+			IElementEditService packService = provider.getEditService(EcorePackage.eINSTANCE.getEPackage());
+			assertNotNull("No IElementEditService found for EPackage.", packService);
+			// Check result
+			assertEquals("The IElementEditService should be EPackage related.", "EPACKG", packService.getDisplayName());
+
+		} catch (ServiceException e) {
+			fail("Test aborted - Service exception in ElementEditServiceProvider::getEditService(EClass).");
+		}
+	}
+
+	@Test
+	public void testGetEditService_EObject() {
+
+		try {
+			EAttribute att = EcoreFactory.eINSTANCE.createEAttribute();
+			EPackage pack = EcoreFactory.eINSTANCE.createEPackage();
+
+			IElementEditService attService = provider.getEditService(att);
+			assertNotNull("No IElementEditService found for EAttribute.", attService);
+			String attServiceDisplayName = attService.getDisplayName();
+			assertEquals("Default IElementEditService should match EAttribute.", "EObject", attServiceDisplayName); //There is an EObject element type introduced in infra.emf
+
+			IElementEditService packService = provider.getEditService(pack);
+			assertNotNull("No IElementEditService found for EPackage.", packService);
+
+			// Check result
+			assertEquals("The IElementEditService should be EPackage related.", "EPACKG", packService.getDisplayName());
+
+		} catch (ServiceException e) {
+			fail("Test aborted - Service exception in ElementEditServiceProvider::getEditService(EObject).");
+		}
+	}
+
+	@Test
+	public void testGetEditService_IElementType() {
+
+		try {
+
+			IElementEditService packService = provider.getEditService(ePackgType);
+			assertNotNull("No IElementEditService found for EPackage.", packService);
+			// Check result
+			assertEquals("The IElementEditService should be EPackage related.", "EPACKG", packService.getDisplayName());
+
+		} catch (ServiceException e) {
+			fail("Test aborted - Service exception in ElementEditServiceProvider::getEditService(EObject).");
+		}
+
+		try {
+
+			ElementTypeRegistry.getInstance().register(new MetamodelType("ETT_TEST_ID", null, "EATT", EcorePackage.eINSTANCE.getEAttribute(), null)); //$NON-NLS-1$
+			IElementType eAtt = ElementTypeRegistry.getInstance().getType("ETT_TEST_ID");
+			IElementEditService attService = provider.getEditService(eAtt);
+			assertNull("No IElementEditService should match EAttribute.", attService);
+
+		} catch (ServiceException e) {
+			// Exception expected.
+			return;
+		}
+
+		fail("The service is supposed to thow exception when the IElementType is incorrect.");
+	}
+
+	@Test
+	public void testGetEditService_Unknown() {
+		try {
+			provider.getEditService("Incorrect_Object");
+		} catch (ServiceException e) {
+			// An exception should be thrown
+			return;
+		}
+
+		fail("No exception thrown will the object cannot be handled.");
+	}
+
+	@Test
+	public void testGetContainedTypeEditServices() {
+		EPackage aPackage = EcoreFactory.eINSTANCE.createEPackage();
+		EClass aClass = EcoreFactory.eINSTANCE.createEClass();
+
+		try {
+			List<IElementEditService> package_ESubpackages = provider.getContainedTypeEditServices(aPackage, EcorePackage.eINSTANCE.getEPackage_ESubpackages());
+			assertEquals("Only 1 IElementEditService should match EcorePackage.eINSTANCE.getEPackage_ESubpackages()", 1, package_ESubpackages.size());
+
+			// Check result
+			IElementEditService service = package_ESubpackages.get(0);
+			assertTrue("The IElementEditService should be EPackage related.", service.getDisplayName().equals("EPACKG"));
+
+			List<IElementEditService> class_EOperations = provider.getContainedTypeEditServices(aClass, EcorePackage.eINSTANCE.getEClass_EOperations());
+			assertEquals("The default IElementEditService should match EcorePackage.eINSTANCE.getEClass_EOperations()", 1, class_EOperations.size());
+			assertEquals("The default IElementEditService should match EcorePackage.eINSTANCE.getEClass_EOperations()", "EObject", class_EOperations.get(0).getDisplayName());
+
+		} catch (ServiceException e) {
+			fail("Test aborted - Service exception in ElementEditServiceProvider::getContainedTypeEditServices.");
+		}
+	}
+
+	@Test
+	public void testIsKnownElementType() {
+		assertFalse("Current IElementType id should not be known.", provider.isKnownElementType("unknown_id"));
+		assertTrue("Current IElementType id should be known.", provider.isKnownElementType(eClassType.getId()));
+
+		// Add an IElementType, not bound to Papyrus context - Should be considered as ignored
+		IMetamodelType eAttr = new MetamodelType("out_of_context_id", null, "EATTR", EcorePackage.eINSTANCE.getEAttribute(), null); //$NON-NLS-1$
+		ElementTypeRegistry.getInstance().register(eAttr);
+
+		assertFalse("Current IElementType id should not be known.", provider.isKnownElementType(eAttr.getId()));
+	}
+}
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/service/TestElementEditServiceProviderFactory.java b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/service/TestElementEditServiceProviderFactory.java
index 4d5e9e78df0..e8be222bfb4 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/service/TestElementEditServiceProviderFactory.java
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/service/TestElementEditServiceProviderFactory.java
@@ -1,38 +1,49 @@
-package org.eclipse.papyrus.infra.services.edit.tests.service;

-

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.assertTrue;

-import static org.junit.Assert.fail;

-

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.services.edit.internal.ElementEditServiceProviderFactory;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditServiceProvider;

-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;

-import org.junit.Test;

-

-/**

- * JUnit tests for {@link ElementEditServiceProviderFactory} class.

- * No specific implementation (no specific test) provided for start / dispose / init.

- */

-public class TestElementEditServiceProviderFactory extends AbstractPapyrusTest {

-

-	@Test

-	public void testCreateServiceInstance() {

-

-		Object service = null;

-

-		try {

-

-			ElementEditServiceProviderFactory factory = new ElementEditServiceProviderFactory();

-			service = factory.createServiceInstance();

-

-		} catch (ServiceException e) {

-			fail("Factory throws exception during service creation (" + e.getMessage() + ").");

-			return;

-		}

-

-		assertNotNull("Created service is null.", service);

-		assertTrue("Unexpected kind of service created.", service instanceof IElementEditServiceProvider);

-	}

-

-}

+package org.eclipse.papyrus.infra.services.edit.tests.service;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.services.ExtensionServicesRegistry;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.services.edit.internal.ElementEditServiceProviderFactory;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditServiceProvider;
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.junit.Test;
+
+/**
+ * JUnit tests for {@link ElementEditServiceProviderFactory} class.
+ * No specific implementation (no specific test) provided for start / dispose / init.
+ */
+public class TestElementEditServiceProviderFactory extends AbstractPapyrusTest {
+
+	@Test
+	public void testCreateServiceInstance() {
+
+		Object service = null;
+		ServicesRegistry registry = null;
+		try {
+			registry = new ExtensionServicesRegistry(org.eclipse.papyrus.infra.core.Activator.PLUGIN_ID);
+			registry.add(ModelSet.class, Integer.MAX_VALUE, new ModelSet());
+			registry.startRegistry();
+		} catch (ServiceException e) {
+			//ignore
+		}
+
+		try {
+			ElementEditServiceProviderFactory factory = new ElementEditServiceProviderFactory();
+			factory.init(registry);
+			service = factory.createServiceInstance();
+
+		} catch (ServiceException e) {
+			fail("Factory throws exception during service creation (" + e.getMessage() + ").");
+			return;
+		}
+
+		assertNotNull("Created service is null.", service);
+		assertTrue("Unexpected kind of service created.", service instanceof IElementEditServiceProvider);
+	}
+
+}
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/service/TestElementEditServiceUtils.java b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/service/TestElementEditServiceUtils.java
index 1313db097fc..823dac362c8 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/service/TestElementEditServiceUtils.java
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/service/TestElementEditServiceUtils.java
@@ -1,42 +1,32 @@
-package org.eclipse.papyrus.infra.services.edit.tests.service;

-

-import static org.junit.Assert.fail;

-

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EcoreFactory;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditServiceProvider;

-import org.eclipse.papyrus.infra.services.edit.tests.AbstractTestElementEditService;

-import org.junit.Test;

-

-public class TestElementEditServiceUtils extends AbstractTestElementEditService {

-

-	@Test

-	public void testGetCommandProvider() {

-

-		// Test EPackage access

-		EPackage eP = EcoreFactory.eINSTANCE.createEPackage();

-		IElementEditService serviceForEPack = ElementEditServiceUtils.getCommandProvider(eP);

-

-		if(serviceForEPack == null) {

-			fail("No IElementEditService found for EPackage.");

-		}

-

-		// Try to get related IElementType to ensure a correct provider is returned

-		IElementType elementType = (IElementType)serviceForEPack.getAdapter(IElementType.class);

-		if(elementType != ePackgType) {

-			fail("The IElementEditService does not rely on the correct IElementType.");

-		}

-	}

-

-	@Test

-	public void testGetEditServiceProvider() {

-		IElementEditServiceProvider provider = ElementEditServiceUtils.getEditServiceProvider();

-		if(provider == null) {

-			fail("Element edit service can not be found.");

-		}

-	}

-

-}

+package org.eclipse.papyrus.infra.services.edit.tests.service;
+
+import static org.junit.Assert.fail;
+
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EcoreFactory;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.infra.services.edit.tests.AbstractTestElementEditService;
+import org.junit.Test;
+
+public class TestElementEditServiceUtils extends AbstractTestElementEditService {
+	
+	@Test
+	public void testGetCommandProvider() {
+
+		// Test EPackage access
+		EPackage eP = EcoreFactory.eINSTANCE.createEPackage();
+		IElementEditService serviceForEPack = ElementEditServiceUtils.getCommandProvider(eP, context);
+
+		if(serviceForEPack == null) {
+			fail("No IElementEditService found for EPackage.");
+		}
+
+		// Try to get related IElementType to ensure a correct provider is returned
+		IElementType elementType = (IElementType)serviceForEPack.getAdapter(IElementType.class);
+		if(elementType != ePackgType) {
+			fail("The IElementEditService does not rely on the correct IElementType.");
+		}
+	}
+}
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/utils/TestGMFCommandUtils.java b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/utils/TestGMFCommandUtils.java
index f215cd475f9..417c2f45cfb 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/utils/TestGMFCommandUtils.java
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/utils/TestGMFCommandUtils.java
@@ -1,44 +1,47 @@
-package org.eclipse.papyrus.infra.services.edit.tests.utils;

-

-import static org.junit.Assert.assertTrue;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.NullProgressMonitor;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EcoreFactory;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.tests.AbstractTestElementEditService;

-import org.eclipse.papyrus.infra.services.edit.utils.GMFCommandUtils;

-import org.junit.Assert;

-import org.junit.Test;

-

-/**

- * JUnit tests for {@link GMFCommandUtils} class.

- */

-public class TestGMFCommandUtils extends AbstractTestElementEditService {

-

-	@Test

-	public void testGetCommandEObjectResult() throws ServiceException, ExecutionException {

-		TransactionalEditingDomain editingDomain = (TransactionalEditingDomain)editor.getAdapter(TransactionalEditingDomain.class);

-

-		// Prepare and execute a command that adds a sub-EPackage

-		EPackage ePckg = EcoreFactory.eINSTANCE.createEPackage();

-		CreateElementRequest req = new CreateElementRequest(editingDomain, ePckg, ePackgType);

-		ICommand createCommand = ElementEditServiceUtils.getCommandProvider(ePckg).getEditCommand(req);

-

-		// Try to execute command and make quick result verification.

-		assertTrue("The service command should be executable.", createCommand.canExecute());

-		createCommand.execute(new NullProgressMonitor(), null);

-

-		// Inspect the result (should be a new EObject)

-		EObject eObject = GMFCommandUtils.getCommandEObjectResult(createCommand);

-		Assert.assertNotNull("Could not get new element from command.", eObject);

-		assertTrue("New element from command should be an EPackage.", eObject instanceof EPackage);

-	}

-

-}

+package org.eclipse.papyrus.infra.services.edit.tests.utils;
+
+import static org.junit.Assert.assertTrue;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EcoreFactory;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.services.edit.context.TypeContext;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.tests.AbstractTestElementEditService;
+import org.eclipse.papyrus.infra.services.edit.utils.GMFCommandUtils;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * JUnit tests for {@link GMFCommandUtils} class.
+ */
+public class TestGMFCommandUtils extends AbstractTestElementEditService {
+
+	@Test
+	public void testGetCommandEObjectResult() throws ServiceException, ExecutionException {
+		TransactionalEditingDomain editingDomain = (TransactionalEditingDomain)editor.getAdapter(TransactionalEditingDomain.class);
+
+		// Prepare and execute a command that adds a sub-EPackage
+		EPackage ePckg = EcoreFactory.eINSTANCE.createEPackage();
+		CreateElementRequest req = new CreateElementRequest(editingDomain, ePckg, ePackgType);
+		IClientContext context = TypeContext.getContext(editingDomain);
+		ICommand createCommand = ElementEditServiceUtils.getCommandProvider(ePckg, context).getEditCommand(req);
+
+		// Try to execute command and make quick result verification.
+		assertTrue("The service command should be executable.", createCommand.canExecute());
+		createCommand.execute(new NullProgressMonitor(), null);
+
+		// Inspect the result (should be a new EObject)
+		EObject eObject = GMFCommandUtils.getCommandEObjectResult(createCommand);
+		Assert.assertNotNull("Could not get new element from command.", eObject);
+		assertTrue("New element from command should be an EPackage.", eObject instanceof EPackage);
+	}
+
+}
diff --git a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/META-INF/MANIFEST.MF
index 714178c7473..11495b66ae9 100644
--- a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/META-INF/MANIFEST.MF
@@ -1,22 +1,22 @@
-Manifest-Version: 1.0

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

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

- org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)",

- org.junit;bundle-version="4.10.0",

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

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

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

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",

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

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

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

-Export-Package: org.eclipse.papyrus.infra.types.tests

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 3.0.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.infra.types.tests.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.infra.types.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0",
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.newchild;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"
+Export-Package: org.eclipse.papyrus.infra.types.tests
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 3.0.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.infra.types.tests.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.infra.types.tests;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src/org/eclipse/papyrus/infra/types/tests/AbstractElementTypeTests.java b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src/org/eclipse/papyrus/infra/types/tests/AbstractElementTypeTests.java
index f33892a1024..12c936170f4 100644
--- a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src/org/eclipse/papyrus/infra/types/tests/AbstractElementTypeTests.java
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src/org/eclipse/papyrus/infra/types/tests/AbstractElementTypeTests.java
@@ -28,6 +28,7 @@ import org.eclipse.papyrus.infra.core.resource.ModelSet;
 import org.eclipse.papyrus.infra.core.resource.ModelUtils;
 import org.eclipse.papyrus.infra.core.resource.NotFoundException;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.services.edit.context.TypeContext;
 import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
 import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
 import org.eclipse.papyrus.junit.utils.EditorUtils;
@@ -144,7 +145,7 @@ public abstract class AbstractElementTypeTests extends AbstractPapyrusTest imple
 		}
 
 		try {
-			papyrusContext = org.eclipse.papyrus.infra.services.edit.internal.context.TypeContext.getContext();
+			papyrusContext = TypeContext.getContext(modelset);
 		} catch (ServiceException e) {
 			fail(e.getMessage());
 		}
diff --git a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src/org/eclipse/papyrus/infra/types/tests/ElementEditHelperAdviceTests.java b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src/org/eclipse/papyrus/infra/types/tests/ElementEditHelperAdviceTests.java
index 883983fbf19..e7dac2a4a03 100644
--- a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src/org/eclipse/papyrus/infra/types/tests/ElementEditHelperAdviceTests.java
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.tests/src/org/eclipse/papyrus/infra/types/tests/ElementEditHelperAdviceTests.java
@@ -1,307 +1,307 @@
-/*****************************************************************************

- * 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:

- *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.infra.types.tests;

-

-import java.util.ArrayList;

-import java.util.Arrays;

-import java.util.List;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.NullProgressMonitor;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;

-import org.eclipse.papyrus.infra.core.services.ServiceException;

-import org.eclipse.papyrus.infra.services.edit.internal.context.TypeContext;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

-import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration;

-import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry;

-import org.eclipse.papyrus.infra.types.core.utils.AdviceComparator;

-import org.eclipse.uml2.uml.Component;

-import org.eclipse.uml2.uml.Package;

-import org.junit.Assert;

-import org.junit.Test;

-

-/**

- * Based upon ExtendedEditHelperAdviceTests

- * Test class for element type edit helper advice

- */

-public class ElementEditHelperAdviceTests extends AbstractElementTypeTests implements ITestConstants {

-

-	@Test

-	// transcoded from extended types framework

-	public void testPACKAGE_WITH_COMPONENTSType() {

-		List<IElementType> elementTypes = Arrays.asList(ElementTypeRegistry.getInstance().getAllTypesMatching(packageWithComponents, papyrusContext));

-		Assert.assertNotNull("list should not be null", elementTypes);

-		Assert.assertTrue("list should not be empty", elementTypes.size() > 0);

-		Assert.assertTrue(PACKAGE_WITH_COMPONENTS + " should be a Package With components only type", elementTypes.contains(ElementTypeRegistry.getInstance().getType(PACKAGE_WITH_COMPONENTS_TYPE_ID)));

-	}

-

-	@Test

-	public void testPACKAGE_WITH_ALL_ELEMENTSType() {

-		List<IElementType> elementTypes = Arrays.asList(ElementTypeRegistry.getInstance().getAllTypesMatching(packageWithAllElements, papyrusContext));

-		Assert.assertNotNull("list should not be null", elementTypes);

-		Assert.assertTrue("list should not be empty", elementTypes.size() > 0);

-		Assert.assertTrue(PACKAGE_WITH_ALL_ELEMENTS + " should not be a Package With components only type", !elementTypes.contains(ElementTypeRegistry.getInstance().getType(PACKAGE_WITH_COMPONENTS_TYPE_ID)));

-	}

-

-	@Test

-	// transcoded from extended types framework

-	public void testSemanticCreateComponentInGoodPackage() throws ExecutionException {

-		testCreateComponent(packageWithComponents, true);

-	}

-

-	@Test

-	// transcoded from extended types framework

-	public void testSemanticCreateComponentInWrongPackage() throws ExecutionException {

-		testCreateComponent(packageWithAllElements, false);

-	}

-

-	protected void testCreateComponent(Package container, boolean canCreate) throws ExecutionException {

-		IProgressMonitor monitor = new NullProgressMonitor();

-		// should be possible

-		IElementType type = ElementTypeRegistry.getInstance().getType(SPECIFICCOMPONENT_TYPE_ID);

-		CreateElementRequest request = new CreateElementRequest(transactionalEditingDomain, container, type);

-		IElementEditService service = ElementEditServiceUtils.getCommandProvider(container);

-		ICommand command = service.getEditCommand(request);

-		// get children before modification

-		List<EObject> originalChildren = new ArrayList<EObject>(container.getPackagedElements());

-		if (canCreate) {

-			Assert.assertTrue("Command should be executable", command.canExecute());

-			IStatus status = command.execute(monitor, null);

-			Assert.assertTrue("Status should be OK", status.isOK());

-			// get result

-			List<EObject> afterCreationChildren = new ArrayList<EObject>(container.getPackagedElements());

-			List<EObject> delta = new ArrayList<EObject>(afterCreationChildren);

-			delta.removeAll(originalChildren);

-			Assert.assertEquals("List should have only one more element", 1, delta.size());

-			// check it does not impact undo

-			Assert.assertTrue("Command should be undoable", command.canUndo());

-			status = command.undo(monitor, null);

-			Assert.assertTrue("Status should be OK", status.isOK());

-			List<EObject> afterUndoChildren = new ArrayList<EObject>(container.getPackagedElements());

-			delta = new ArrayList<EObject>(afterUndoChildren);

-			delta.removeAll(originalChildren);

-			Assert.assertEquals("List should have no element", 0, delta.size());

-			// should be redoable

-			Assert.assertTrue("Command should be redoable", command.canRedo());

-			status = command.redo(monitor, null);

-			Assert.assertTrue("Status should be OK", status.isOK());

-			List<EObject> afterRedoChildren = new ArrayList<EObject>(container.getPackagedElements());

-			delta = new ArrayList<EObject>(afterRedoChildren);

-			delta.removeAll(originalChildren);

-			Assert.assertEquals("List should have one more element", 1, delta.size());

-			// undo to revert state

-			Assert.assertTrue("Command should be undoable", command.canUndo());

-			status = command.undo(monitor, null);

-			Assert.assertTrue("Status should be OK", status.isOK());

-		} else {

-			Assert.assertTrue("Command should not be executable", command == null || !(command.canExecute()));

-		}

-	}

-

-	@Test

-	public void testSemanticMoveComponentFromGoodPackageToGoodPackage() throws ExecutionException {

-		// should be possible (target = good package)

-		testMoveComponent(otherPackageWithComponents, component1_packageWithComponents, true);

-	}

-

-	@Test

-	// transcoded from extended types framework

-	public void testSemanticMoveComponentFromGoodPackageToWrongPackage() throws ExecutionException {

-		// should be impossible (target = wrong package)

-		testMoveComponent(packageWithAllElements, component1_packageWithComponents, false);

-	}

-

-	@Test

-	public void testSemanticMoveComponentFromWrongPackageToGoodPackage() throws ExecutionException {

-		// should be possible (target = good package)

-		testMoveComponent(packageWithComponents, component1_packageWithAllElements, true);

-	}

-

-	@Test

-	public void testSemanticMoveComponentFromWrongPackageToWrongPackage() throws ExecutionException {

-		// should be impossible (target = wrong package)

-		testMoveComponent(packageWithAllElements, component1_packageWithAllElements, false);

-	}

-

-	protected void testMoveComponent(Package targetContainer, Component sourceComponent, boolean canMove) throws ExecutionException {

-		IProgressMonitor monitor = new NullProgressMonitor();

-		// should be possible

-		MoveRequest request = new MoveRequest(transactionalEditingDomain, targetContainer, sourceComponent);

-		IElementEditService service = ElementEditServiceUtils.getCommandProvider(targetContainer);

-		ICommand command = service.getEditCommand(request);

-		// get children before modification

-		List<EObject> originalChildren = new ArrayList<EObject>(targetContainer.getPackagedElements());

-		if (canMove) {

-			Assert.assertTrue("Command should be executable", command.canExecute());

-			IStatus status = command.execute(monitor, null);

-			Assert.assertTrue("Status should be OK", status.isOK());

-			// get result

-			List<EObject> afterCreationChildren = new ArrayList<EObject>(targetContainer.getPackagedElements());

-			List<EObject> delta = new ArrayList<EObject>(afterCreationChildren);

-			delta.removeAll(originalChildren);

-			Assert.assertEquals("List should have only one more element", 1, delta.size());

-			// check it does not impact undo

-			Assert.assertTrue("Command should be undoable", command.canUndo());

-			status = command.undo(monitor, null);

-			Assert.assertTrue("Status should be OK", status.isOK());

-			List<EObject> afterUndoChildren = new ArrayList<EObject>(targetContainer.getPackagedElements());

-			delta = new ArrayList<EObject>(afterUndoChildren);

-			delta.removeAll(originalChildren);

-			Assert.assertEquals("List should have no element", 0, delta.size());

-			// should be redoable

-			Assert.assertTrue("Command should be undoable", command.canUndo());

-			status = command.undo(monitor, null);

-			Assert.assertTrue("Status should be OK", status.isOK());

-			List<EObject> afterRedoChildren = new ArrayList<EObject>(targetContainer.getPackagedElements());

-			delta = new ArrayList<EObject>(afterRedoChildren);

-			delta.removeAll(originalChildren);

-			Assert.assertEquals("List should have one more element", 1, delta.size());

-			// undo to revert state

-			Assert.assertTrue("Command should be undoable", command.canUndo());

-			status = command.undo(monitor, null);

-			Assert.assertTrue("Status should be OK", status.isOK());

-		} else {

-			Assert.assertTrue("Command should not be executable", command == null || !command.canExecute());

-		}

-	}

-

-	@Test

-	public void testDeleteComponentFromWrongPackage() throws ExecutionException {

-		// should be possible. no influence on deletion is expected

-		testDeleteComponent(component1_packageWithAllElements, true);

-	}

-

-	@Test

-	public void testDeleteComponentFromGoodPackage() throws ExecutionException {

-		// should be possible. no influence on deletion is expected

-		testDeleteComponent(component1_packageWithComponents, true);

-	}

-

-	protected void testDeleteComponent(EObject objectToDelete, boolean canDelete) throws ExecutionException {

-		IProgressMonitor monitor = new NullProgressMonitor();

-		// should be possible

-		DestroyElementRequest request = new DestroyElementRequest(transactionalEditingDomain, objectToDelete, false);

-		IElementEditService service = ElementEditServiceUtils.getCommandProvider(objectToDelete);

-		ICommand command = service.getEditCommand(request);

-		// get children before modification

-		List<EObject> originalChildren = new ArrayList<EObject>((List<EObject>) objectToDelete.eContainer().eGet(objectToDelete.eContainingFeature(), true));

-		EObject container = objectToDelete.eContainer();

-		EStructuralFeature containingFeature = objectToDelete.eContainingFeature();

-		if (canDelete) {

-			Assert.assertTrue("Command should be executable", command.canExecute());

-			IStatus status = command.execute(monitor, null);

-			Assert.assertTrue("Status should be OK", status.isOK());

-			// get result

-			List<EObject> afterDeletionChildren = new ArrayList<EObject>((List<EObject>) container.eGet(containingFeature, true));

-			List<EObject> delta = new ArrayList<EObject>(originalChildren);

-			delta.removeAll(afterDeletionChildren);

-			Assert.assertEquals("List should have one element only", 1, delta.size());

-			Assert.assertEquals("deleted element should be the specified one", objectToDelete, delta.get(0));

-			// check it does not impact undo

-			Assert.assertTrue("Command should be undoable", command.canUndo());

-			status = command.undo(monitor, null);

-			Assert.assertTrue("Status should be OK", status.isOK());

-			List<EObject> afterUndoChildren = new ArrayList<EObject>((List<EObject>) container.eGet(containingFeature, true));

-			delta = new ArrayList<EObject>(afterUndoChildren);

-			delta.removeAll(originalChildren);

-			Assert.assertEquals("List should have no element", 0, delta.size());

-			// should be redoable

-			Assert.assertTrue("Command should be redoable", command.canRedo());

-			status = command.redo(monitor, null);

-			Assert.assertTrue("Status should be OK", status.isOK());

-			List<EObject> afterRedoChildren = new ArrayList<EObject>((List<EObject>) container.eGet(containingFeature, true));

-			delta = new ArrayList<EObject>(originalChildren);

-			delta.removeAll(afterRedoChildren);

-			Assert.assertEquals("List should have one more element", 1, delta.size());

-			// undo to revert state

-			Assert.assertTrue("Command should be undoable", command.canUndo());

-			status = command.undo(monitor, null);

-			Assert.assertTrue("Status should be OK", status.isOK());

-		} else {

-			Assert.assertTrue("Command should not be executable", command == null || !command.canExecute());

-		}

-	}

-

-	@Test

-	public void testValidAdvicesOrder() {

-		IElementType classElementType = ElementTypeRegistry.getInstance().getType("org.eclipse.papyrus.uml.Class");

-		ResourceSet resourceSet = new ResourceSetImpl();

-		Resource validAdviesOrderConfigurationResource = resourceSet.getResource(URI.createURI(VALID_ADVICES_ORDER_CONFIGURATIONS), true);

-		EObject root = validAdviesOrderConfigurationResource.getContents().get(0);

-		if (root instanceof ElementTypeSetConfiguration) {

-

-			try {

-				ElementTypeSetConfigurationRegistry.getInstance().loadElementTypeSetConfiguration(TypeContext.getContext().getId(), (ElementTypeSetConfiguration) root);

-				IEditHelperAdvice[] advicesAfterLoading = ElementTypeRegistry.getInstance().getEditHelperAdvice(classElementType);

-				Arrays.sort(advicesAfterLoading, new AdviceComparator(classElementType, TypeContext.getContext().getId()));

-				int advice1Index = -1;

-				int advice2Index = -1;

-				int advice3Index = -1;

-				for (int i = 0; i < advicesAfterLoading.length; i++) {

-					IEditHelperAdvice iEditHelperAdvice = advicesAfterLoading[i];

-					if (iEditHelperAdvice.getClass().getName().equals(ADVICES_ID_1)) {

-						advice1Index = i;

-					} else if (iEditHelperAdvice.getClass().getName().equals(ADVICES_ID_2)) {

-						advice2Index = i;

-					} else if (iEditHelperAdvice.getClass().getName().equals(ADVICES_ID_3)) {

-						advice3Index = i;

-					}

-				}

-

-				Assert.assertTrue(ADVICES_ID_2 + " should be after " + ADVICES_ID_3, advice3Index < advice2Index);

-				Assert.assertTrue(ADVICES_ID_3 + " should be after " + ADVICES_ID_1, advice2Index < advice1Index);

-			} catch (ServiceException e) {

-				// TODO Auto-generated catch block

-				e.printStackTrace();

-			}

-

-		} else {

-			Assert.fail("Failed to load test model: " + CYCLIC_ADVICES_CONFIGURATIONS);

-		}

-	}

-

-	@Test

-	public void testCyclicAdvices() {

-		IElementType classElementType = ElementTypeRegistry.getInstance().getType("org.eclipse.papyrus.uml.Class");

-		IEditHelperAdvice[] advicesBeforeLoading = ElementTypeRegistry.getInstance().getEditHelperAdvice(classElementType);

-		ResourceSet resourceSet = new ResourceSetImpl();

-		Resource cyclicAdvicesConfigurationResource = resourceSet.getResource(URI.createURI(CYCLIC_ADVICES_CONFIGURATIONS), true);

-		org.eclipse.emf.ecore.EObject root = cyclicAdvicesConfigurationResource.getContents().get(0);

-		if (root instanceof ElementTypeSetConfiguration) {

-			try {

-				ElementTypeSetConfigurationRegistry.getInstance().loadElementTypeSetConfiguration(TypeContext.getContext().getId(), (ElementTypeSetConfiguration) root);

-			} catch (ServiceException e) {

-				// TODO Auto-generated catch block

-				e.printStackTrace();

-			}

-			IEditHelperAdvice[] advicesAfterLoading = ElementTypeRegistry.getInstance().getEditHelperAdvice(classElementType);

-			Assert.assertArrayEquals("Advices for UML::Class should have not been changed: ", advicesBeforeLoading, advicesAfterLoading);

-		} else {

-			Assert.fail("Failed to load test model: " + CYCLIC_ADVICES_CONFIGURATIONS);

-		}

-	}

+/*****************************************************************************
+ * 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:
+ *  Francois Le Fevre (CEA LIST) francois.le-fevre@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.types.tests;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.edithelper.IEditHelperAdvice;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.services.edit.context.TypeContext;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration;
+import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry;
+import org.eclipse.papyrus.infra.types.core.utils.AdviceComparator;
+import org.eclipse.uml2.uml.Component;
+import org.eclipse.uml2.uml.Package;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * Based upon ExtendedEditHelperAdviceTests
+ * Test class for element type edit helper advice
+ */
+public class ElementEditHelperAdviceTests extends AbstractElementTypeTests implements ITestConstants {
+
+	@Test
+	// transcoded from extended types framework
+	public void testPACKAGE_WITH_COMPONENTSType() {
+		List<IElementType> elementTypes = Arrays.asList(ElementTypeRegistry.getInstance().getAllTypesMatching(packageWithComponents, papyrusContext));
+		Assert.assertNotNull("list should not be null", elementTypes);
+		Assert.assertTrue("list should not be empty", elementTypes.size() > 0);
+		Assert.assertTrue(PACKAGE_WITH_COMPONENTS + " should be a Package With components only type", elementTypes.contains(ElementTypeRegistry.getInstance().getType(PACKAGE_WITH_COMPONENTS_TYPE_ID)));
+	}
+
+	@Test
+	public void testPACKAGE_WITH_ALL_ELEMENTSType() {
+		List<IElementType> elementTypes = Arrays.asList(ElementTypeRegistry.getInstance().getAllTypesMatching(packageWithAllElements, papyrusContext));
+		Assert.assertNotNull("list should not be null", elementTypes);
+		Assert.assertTrue("list should not be empty", elementTypes.size() > 0);
+		Assert.assertTrue(PACKAGE_WITH_ALL_ELEMENTS + " should not be a Package With components only type", !elementTypes.contains(ElementTypeRegistry.getInstance().getType(PACKAGE_WITH_COMPONENTS_TYPE_ID)));
+	}
+
+	@Test
+	// transcoded from extended types framework
+	public void testSemanticCreateComponentInGoodPackage() throws ExecutionException {
+		testCreateComponent(packageWithComponents, true);
+	}
+
+	@Test
+	// transcoded from extended types framework
+	public void testSemanticCreateComponentInWrongPackage() throws ExecutionException {
+		testCreateComponent(packageWithAllElements, false);
+	}
+
+	protected void testCreateComponent(Package container, boolean canCreate) throws ExecutionException {
+		IProgressMonitor monitor = new NullProgressMonitor();
+		// should be possible
+		IElementType type = ElementTypeRegistry.getInstance().getType(SPECIFICCOMPONENT_TYPE_ID);
+		CreateElementRequest request = new CreateElementRequest(transactionalEditingDomain, container, type);
+		IElementEditService service = ElementEditServiceUtils.getCommandProvider(container);
+		ICommand command = service.getEditCommand(request);
+		// get children before modification
+		List<EObject> originalChildren = new ArrayList<EObject>(container.getPackagedElements());
+		if (canCreate) {
+			Assert.assertTrue("Command should be executable", command.canExecute());
+			IStatus status = command.execute(monitor, null);
+			Assert.assertTrue("Status should be OK", status.isOK());
+			// get result
+			List<EObject> afterCreationChildren = new ArrayList<EObject>(container.getPackagedElements());
+			List<EObject> delta = new ArrayList<EObject>(afterCreationChildren);
+			delta.removeAll(originalChildren);
+			Assert.assertEquals("List should have only one more element", 1, delta.size());
+			// check it does not impact undo
+			Assert.assertTrue("Command should be undoable", command.canUndo());
+			status = command.undo(monitor, null);
+			Assert.assertTrue("Status should be OK", status.isOK());
+			List<EObject> afterUndoChildren = new ArrayList<EObject>(container.getPackagedElements());
+			delta = new ArrayList<EObject>(afterUndoChildren);
+			delta.removeAll(originalChildren);
+			Assert.assertEquals("List should have no element", 0, delta.size());
+			// should be redoable
+			Assert.assertTrue("Command should be redoable", command.canRedo());
+			status = command.redo(monitor, null);
+			Assert.assertTrue("Status should be OK", status.isOK());
+			List<EObject> afterRedoChildren = new ArrayList<EObject>(container.getPackagedElements());
+			delta = new ArrayList<EObject>(afterRedoChildren);
+			delta.removeAll(originalChildren);
+			Assert.assertEquals("List should have one more element", 1, delta.size());
+			// undo to revert state
+			Assert.assertTrue("Command should be undoable", command.canUndo());
+			status = command.undo(monitor, null);
+			Assert.assertTrue("Status should be OK", status.isOK());
+		} else {
+			Assert.assertTrue("Command should not be executable", command == null || !(command.canExecute()));
+		}
+	}
+
+	@Test
+	public void testSemanticMoveComponentFromGoodPackageToGoodPackage() throws ExecutionException {
+		// should be possible (target = good package)
+		testMoveComponent(otherPackageWithComponents, component1_packageWithComponents, true);
+	}
+
+	@Test
+	// transcoded from extended types framework
+	public void testSemanticMoveComponentFromGoodPackageToWrongPackage() throws ExecutionException {
+		// should be impossible (target = wrong package)
+		testMoveComponent(packageWithAllElements, component1_packageWithComponents, false);
+	}
+
+	@Test
+	public void testSemanticMoveComponentFromWrongPackageToGoodPackage() throws ExecutionException {
+		// should be possible (target = good package)
+		testMoveComponent(packageWithComponents, component1_packageWithAllElements, true);
+	}
+
+	@Test
+	public void testSemanticMoveComponentFromWrongPackageToWrongPackage() throws ExecutionException {
+		// should be impossible (target = wrong package)
+		testMoveComponent(packageWithAllElements, component1_packageWithAllElements, false);
+	}
+
+	protected void testMoveComponent(Package targetContainer, Component sourceComponent, boolean canMove) throws ExecutionException {
+		IProgressMonitor monitor = new NullProgressMonitor();
+		// should be possible
+		MoveRequest request = new MoveRequest(transactionalEditingDomain, targetContainer, sourceComponent);
+		IElementEditService service = ElementEditServiceUtils.getCommandProvider(targetContainer);
+		ICommand command = service.getEditCommand(request);
+		// get children before modification
+		List<EObject> originalChildren = new ArrayList<EObject>(targetContainer.getPackagedElements());
+		if (canMove) {
+			Assert.assertTrue("Command should be executable", command.canExecute());
+			IStatus status = command.execute(monitor, null);
+			Assert.assertTrue("Status should be OK", status.isOK());
+			// get result
+			List<EObject> afterCreationChildren = new ArrayList<EObject>(targetContainer.getPackagedElements());
+			List<EObject> delta = new ArrayList<EObject>(afterCreationChildren);
+			delta.removeAll(originalChildren);
+			Assert.assertEquals("List should have only one more element", 1, delta.size());
+			// check it does not impact undo
+			Assert.assertTrue("Command should be undoable", command.canUndo());
+			status = command.undo(monitor, null);
+			Assert.assertTrue("Status should be OK", status.isOK());
+			List<EObject> afterUndoChildren = new ArrayList<EObject>(targetContainer.getPackagedElements());
+			delta = new ArrayList<EObject>(afterUndoChildren);
+			delta.removeAll(originalChildren);
+			Assert.assertEquals("List should have no element", 0, delta.size());
+			// should be redoable
+			Assert.assertTrue("Command should be undoable", command.canUndo());
+			status = command.undo(monitor, null);
+			Assert.assertTrue("Status should be OK", status.isOK());
+			List<EObject> afterRedoChildren = new ArrayList<EObject>(targetContainer.getPackagedElements());
+			delta = new ArrayList<EObject>(afterRedoChildren);
+			delta.removeAll(originalChildren);
+			Assert.assertEquals("List should have one more element", 1, delta.size());
+			// undo to revert state
+			Assert.assertTrue("Command should be undoable", command.canUndo());
+			status = command.undo(monitor, null);
+			Assert.assertTrue("Status should be OK", status.isOK());
+		} else {
+			Assert.assertTrue("Command should not be executable", command == null || !command.canExecute());
+		}
+	}
+
+	@Test
+	public void testDeleteComponentFromWrongPackage() throws ExecutionException {
+		// should be possible. no influence on deletion is expected
+		testDeleteComponent(component1_packageWithAllElements, true);
+	}
+
+	@Test
+	public void testDeleteComponentFromGoodPackage() throws ExecutionException {
+		// should be possible. no influence on deletion is expected
+		testDeleteComponent(component1_packageWithComponents, true);
+	}
+
+	protected void testDeleteComponent(EObject objectToDelete, boolean canDelete) throws ExecutionException {
+		IProgressMonitor monitor = new NullProgressMonitor();
+		// should be possible
+		DestroyElementRequest request = new DestroyElementRequest(transactionalEditingDomain, objectToDelete, false);
+		IElementEditService service = ElementEditServiceUtils.getCommandProvider(objectToDelete);
+		ICommand command = service.getEditCommand(request);
+		// get children before modification
+		List<EObject> originalChildren = new ArrayList<EObject>((List<EObject>) objectToDelete.eContainer().eGet(objectToDelete.eContainingFeature(), true));
+		EObject container = objectToDelete.eContainer();
+		EStructuralFeature containingFeature = objectToDelete.eContainingFeature();
+		if (canDelete) {
+			Assert.assertTrue("Command should be executable", command.canExecute());
+			IStatus status = command.execute(monitor, null);
+			Assert.assertTrue("Status should be OK", status.isOK());
+			// get result
+			List<EObject> afterDeletionChildren = new ArrayList<EObject>((List<EObject>) container.eGet(containingFeature, true));
+			List<EObject> delta = new ArrayList<EObject>(originalChildren);
+			delta.removeAll(afterDeletionChildren);
+			Assert.assertEquals("List should have one element only", 1, delta.size());
+			Assert.assertEquals("deleted element should be the specified one", objectToDelete, delta.get(0));
+			// check it does not impact undo
+			Assert.assertTrue("Command should be undoable", command.canUndo());
+			status = command.undo(monitor, null);
+			Assert.assertTrue("Status should be OK", status.isOK());
+			List<EObject> afterUndoChildren = new ArrayList<EObject>((List<EObject>) container.eGet(containingFeature, true));
+			delta = new ArrayList<EObject>(afterUndoChildren);
+			delta.removeAll(originalChildren);
+			Assert.assertEquals("List should have no element", 0, delta.size());
+			// should be redoable
+			Assert.assertTrue("Command should be redoable", command.canRedo());
+			status = command.redo(monitor, null);
+			Assert.assertTrue("Status should be OK", status.isOK());
+			List<EObject> afterRedoChildren = new ArrayList<EObject>((List<EObject>) container.eGet(containingFeature, true));
+			delta = new ArrayList<EObject>(originalChildren);
+			delta.removeAll(afterRedoChildren);
+			Assert.assertEquals("List should have one more element", 1, delta.size());
+			// undo to revert state
+			Assert.assertTrue("Command should be undoable", command.canUndo());
+			status = command.undo(monitor, null);
+			Assert.assertTrue("Status should be OK", status.isOK());
+		} else {
+			Assert.assertTrue("Command should not be executable", command == null || !command.canExecute());
+		}
+	}
+
+	@Test
+	public void testValidAdvicesOrder() {
+		IElementType classElementType = ElementTypeRegistry.getInstance().getType("org.eclipse.papyrus.uml.Class");
+		ResourceSet resourceSet = new ResourceSetImpl();
+		Resource validAdviesOrderConfigurationResource = resourceSet.getResource(URI.createURI(VALID_ADVICES_ORDER_CONFIGURATIONS), true);
+		EObject root = validAdviesOrderConfigurationResource.getContents().get(0);
+		if (root instanceof ElementTypeSetConfiguration) {
+
+			try {
+				ElementTypeSetConfigurationRegistry.getInstance().loadElementTypeSetConfiguration(TypeContext.getDefaultContext().getId(), (ElementTypeSetConfiguration) root);
+				IEditHelperAdvice[] advicesAfterLoading = ElementTypeRegistry.getInstance().getEditHelperAdvice(classElementType, TypeContext.getDefaultContext());
+				Arrays.sort(advicesAfterLoading, new AdviceComparator(classElementType, TypeContext.getDefaultContext().getId()));
+				int advice1Index = -1;
+				int advice2Index = -1;
+				int advice3Index = -1;
+				for (int i = 0; i < advicesAfterLoading.length; i++) {
+					IEditHelperAdvice iEditHelperAdvice = advicesAfterLoading[i];
+					if (iEditHelperAdvice.getClass().getName().equals(ADVICES_ID_1)) {
+						advice1Index = i;
+					} else if (iEditHelperAdvice.getClass().getName().equals(ADVICES_ID_2)) {
+						advice2Index = i;
+					} else if (iEditHelperAdvice.getClass().getName().equals(ADVICES_ID_3)) {
+						advice3Index = i;
+					}
+				}
+
+				Assert.assertTrue(ADVICES_ID_2 + " should be after " + ADVICES_ID_3, advice3Index < advice2Index);
+				Assert.assertTrue(ADVICES_ID_3 + " should be after " + ADVICES_ID_1, advice2Index < advice1Index);
+			} catch (ServiceException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+
+		} else {
+			Assert.fail("Failed to load test model: " + CYCLIC_ADVICES_CONFIGURATIONS);
+		}
+	}
+
+	@Test
+	public void testCyclicAdvices() {
+		IElementType classElementType = ElementTypeRegistry.getInstance().getType("org.eclipse.papyrus.uml.Class");
+		IEditHelperAdvice[] advicesBeforeLoading = ElementTypeRegistry.getInstance().getEditHelperAdvice(classElementType);
+		ResourceSet resourceSet = new ResourceSetImpl();
+		Resource cyclicAdvicesConfigurationResource = resourceSet.getResource(URI.createURI(CYCLIC_ADVICES_CONFIGURATIONS), true);
+		org.eclipse.emf.ecore.EObject root = cyclicAdvicesConfigurationResource.getContents().get(0);
+		if (root instanceof ElementTypeSetConfiguration) {
+			try {
+				ElementTypeSetConfigurationRegistry.getInstance().loadElementTypeSetConfiguration(TypeContext.getDefaultContext().getId(), (ElementTypeSetConfiguration) root);
+			} catch (ServiceException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+			IEditHelperAdvice[] advicesAfterLoading = ElementTypeRegistry.getInstance().getEditHelperAdvice(classElementType);
+			Assert.assertArrayEquals("Advices for UML::Class should have not been changed: ", advicesBeforeLoading, advicesAfterLoading);
+		} else {
+			Assert.fail("Failed to load test model: " + CYCLIC_ADVICES_CONFIGURATIONS);
+		}
+	}
 }
\ No newline at end of file
diff --git a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/src/org/eclipse/papyrus/infra/types/ui/tests/ElementTypesRegistryTests.java b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/src/org/eclipse/papyrus/infra/types/ui/tests/ElementTypesRegistryTests.java
index 44389ddab78..9336bd290d2 100644
--- a/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/src/org/eclipse/papyrus/infra/types/ui/tests/ElementTypesRegistryTests.java
+++ b/tests/junit/plugins/infra/types/org.eclipse.papyrus.infra.types.ui.tests/src/org/eclipse/papyrus/infra/types/ui/tests/ElementTypesRegistryTests.java
@@ -24,7 +24,7 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.services.edit.internal.context.TypeContext;
+import org.eclipse.papyrus.infra.services.edit.context.TypeContext;
 import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry;
 import org.eclipse.papyrus.infra.types.tests.AbstractElementTypeTests;
 import org.eclipse.papyrus.infra.types.tests.ITestConstants;
@@ -96,14 +96,14 @@ public class ElementTypesRegistryTests extends AbstractElementTypeTests implemen
 		checkPluginTypes();
 		// register
 		try {
-			ElementTypeSetConfigurationRegistry.getInstance().loadElementTypeSetConfiguration(TypeContext.getContext().getId(), workspaceTestFile.getFullPath().toString());
+			ElementTypeSetConfigurationRegistry.getInstance().loadElementTypeSetConfiguration(TypeContext.getDefaultContext().getId(), workspaceTestFile.getFullPath().toString());
 
 			//
 			workspaceType = ElementTypeRegistry.getInstance().getType(WORKSPACE_ELEMENT_TYPE_TOOL);
 			Assert.assertNotNull("Element type should be registered", workspaceType);
 			checkPluginTypes();
 			// unregister
-			ElementTypeSetConfigurationRegistry.getInstance().unload(TypeContext.getContext().getId(), WORKSPACE_ELEMENT_TYPE_ID);
+			ElementTypeSetConfigurationRegistry.getInstance().unload(TypeContext.getDefaultContext().getId(), WORKSPACE_ELEMENT_TYPE_ID);
 			workspaceType = ElementTypeRegistry.getInstance().getType(WORKSPACE_ELEMENT_TYPE_TOOL);
 			Assert.assertNull("Element type should not be registered anymore", workspaceType);
 			checkPluginTypes();
diff --git a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/.classpath b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/.classpath
deleted file mode 100644
index 6cc5414644b..00000000000
--- a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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.7"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src-gen"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/.project b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/.project
deleted file mode 100644
index b88580d19f2..00000000000
--- a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.infra.viewpoints.configuration.tests</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.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f08be2b06c4..00000000000
--- a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,291 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
-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/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 954281dbc31..00000000000
--- a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-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/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 8a5801d286e..00000000000
--- a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.viewpoints.configuration.tests

-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.11.0",

- org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.2.0";visibility:=reexport,

- org.eclipse.papyrus.infra.constraints;bundle-version="1.2.0";visibility:=reexport,

- org.eclipse.papyrus.infra.viewpoints.iso42010;bundle-version="1.2.0";visibility:=reexport,

- org.eclipse.emf.ecore.xmi;bundle-version="2.11.0";visibility:=reexport,

- org.junit;bundle-version="4.11.0";visibility:=reexport,

- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.9.0",

- org.eclipse.papyrus.junit.framework;bundle-version="1.2.0"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.viewpoints.configuration.tests;singleton:=true

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

diff --git a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/about.html b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/about.html
deleted file mode 100644
index d35d5aed64c..00000000000
--- a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!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>June 5, 2007</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>
diff --git a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/build.properties b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/build.properties
deleted file mode 100644
index 468ff6950bc..00000000000
--- a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/build.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Copyright (c) 2015 Christian W. Damus and others.
-# 
-#  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:
-#  Christian W. Damus - Initial API and implementation
-# 
-
-bin.includes = .,\
-               META-INF/,\
-               plugin.properties,\
-               about.html
-jars.compile.order = .
-source.. = src/,\
-           src-gen/
-output.. = bin/
-src.includes = about.html
diff --git a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/org.eclipse.papyrus.infra.viewpoints.configuration.tests.launch b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/org.eclipse.papyrus.infra.viewpoints.configuration.tests.launch
deleted file mode 100644
index 0ed17f6879d..00000000000
--- a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/org.eclipse.papyrus.infra.viewpoints.configuration.tests.launch
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src/org/eclipse/papyrus/infra/viewpoints/configuration/tests/AllTests.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.infra.viewpoints.configuration.tests.AllTests"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.infra.viewpoints.configuration.tests"/>
-</launchConfiguration>
diff --git a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/plugin.properties b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/plugin.properties
deleted file mode 100644
index a6cbe97613b..00000000000
--- a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/plugin.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-#  
-# Copyright (c) 2015 Christian W. Damus and others.
-# 
-# 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:
-#  Christian W. Damus - Initial API and implementation
-# 
-
-pluginName = Viewpoints Configuration Model Tests
-providerName = Eclipse Modeling Project
diff --git a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/AssistantRuleTest.java b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/AssistantRuleTest.java
deleted file mode 100644
index 75616506998..00000000000
--- a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/AssistantRuleTest.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/**
- * Copyright (c) 2015 Christian W. Damus and others.
- *
- *  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:
- *  Christian W. Damus - Initial API and implementation
- *
- *
- */
-package org.eclipse.papyrus.infra.viewpoints.configuration.tests;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.infra.viewpoints.configuration.AssistantRule;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationFactory;
-
-import junit.textui.TestRunner;
-
-/**
- * <!-- begin-user-doc -->
- * A test case for the model object '<em><b>Assistant Rule</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following operations are tested:
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.AssistantRule#matches(org.eclipse.gmf.runtime.emf.type.core.IElementType)
- * <em>Matches</em>}</li>
- * </ul>
- * </p>
- * 
- * @generated
- */
-public class AssistantRuleTest extends RuleTest {
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public static void main(String[] args) {
-		TestRunner.run(AssistantRuleTest.class);
-	}
-
-	/**
-	 * Constructs a new Assistant Rule test case with the given name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public AssistantRuleTest(String name) {
-		super(name);
-	}
-
-	/**
-	 * Returns the fixture for this Assistant Rule test case.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	protected AssistantRule getFixture() {
-		return (AssistantRule)fixture;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see junit.framework.TestCase#setUp()
-	 * @generated
-	 */
-	@Override
-	protected void setUp() throws Exception {
-		setFixture(ConfigurationFactory.eINSTANCE.createAssistantRule());
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see junit.framework.TestCase#tearDown()
-	 * @generated
-	 */
-	@Override
-	protected void tearDown() throws Exception {
-		setFixture(null);
-	}
-
-	/**
-	 * Tests the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.AssistantRule#matches(org.eclipse.gmf.runtime.emf.type.core.IElementType)
-	 * <em>Matches</em>}' operation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.AssistantRule#matches(org.eclipse.gmf.runtime.emf.type.core.IElementType)
-	 * @generated NOT
-	 */
-	public void testMatches__IElementType() {
-		IElementType elementType = mockElementType("test.element.type.Foo");
-
-		// No ID pattern: matches any element type
-		assertThat(getFixture().matches(elementType), is(true));
-
-		// Exact ID match
-		getFixture().setElementTypeID("test.element.type.Foo");
-		assertThat(getFixture().matches(elementType), is(true));
-
-		// Exact ID mismatch
-		getFixture().setElementTypeID("test.element.type.Bar");
-		assertThat(getFixture().matches(elementType), is(false));
-
-		// Wildcard ID match
-		getFixture().setElementTypeID("test.element.type.*");
-		assertThat(getFixture().matches(elementType), is(true));
-
-		// Wildcard ID mismatch
-		getFixture().setElementTypeID("test.element.junk.*");
-		assertThat(getFixture().matches(elementType), is(false));
-
-		// Prefix wildcard ID match
-		getFixture().setElementTypeID("*.Foo");
-		assertThat(getFixture().matches(elementType), is(true));
-
-		// Prefix wildcard ID mis match
-		getFixture().setElementTypeID("*.Bar");
-		assertThat(getFixture().matches(elementType), is(false));
-	}
-
-	IElementType mockElementType(final String id) {
-		return (IElementType)Proxy.newProxyInstance(getClass().getClassLoader(), new Class<?>[]{ IElementType.class }, new InvocationHandler() {
-
-			@Override
-			public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-				if(method.getDeclaringClass().equals(Object.class)) {
-					return method.invoke(this, args);
-				} else if((method.getDeclaringClass() == IElementType.class) && method.getName().equals("getId")) {
-					return id;
-				}
-
-				return null;
-			}
-		});
-	}
-} //AssistantRuleTest
diff --git a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/CategoryTest.java b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/CategoryTest.java
deleted file mode 100644
index 43c39afc09a..00000000000
--- a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/CategoryTest.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- * Copyright (c) 2015 Christian W. Damus and others.
- *
- *  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:
- *  Christian W. Damus - Initial API and implementation
- *
- *
- */
-package org.eclipse.papyrus.infra.viewpoints.configuration.tests;
-
-import junit.framework.TestCase;
-
-import junit.textui.TestRunner;
-
-import org.eclipse.papyrus.infra.viewpoints.configuration.Category;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationFactory;
-
-/**
- * <!-- begin-user-doc -->
- * A test case for the model object '<em><b>Category</b></em>'.
- * <!-- end-user-doc -->
- * @generated
- */
-public class CategoryTest extends TestCase {
-
-	/**
-	 * The fixture for this Category test case.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Category fixture = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static void main(String[] args) {
-		TestRunner.run(CategoryTest.class);
-	}
-
-	/**
-	 * Constructs a new Category test case with the given name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CategoryTest(String name) {
-		super(name);
-	}
-
-	/**
-	 * Sets the fixture for this Category test case.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void setFixture(Category fixture) {
-		this.fixture = fixture;
-	}
-
-	/**
-	 * Returns the fixture for this Category test case.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Category getFixture() {
-		return fixture;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see junit.framework.TestCase#setUp()
-	 * @generated
-	 */
-	@Override
-	protected void setUp() throws Exception {
-		setFixture(ConfigurationFactory.eINSTANCE.createCategory());
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see junit.framework.TestCase#tearDown()
-	 * @generated
-	 */
-	@Override
-	protected void tearDown() throws Exception {
-		setFixture(null);
-	}
-
-} //CategoryTest
diff --git a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/ChildRuleTest.java b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/ChildRuleTest.java
deleted file mode 100644
index 2f0346b25fe..00000000000
--- a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/ChildRuleTest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * Copyright (c) 2015 Christian W. Damus and others.
- *
- *  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:
- *  Christian W. Damus - Initial API and implementation
- *
- *
- */
-package org.eclipse.papyrus.infra.viewpoints.configuration.tests;
-
-import junit.textui.TestRunner;
-
-import org.eclipse.papyrus.infra.viewpoints.configuration.ChildRule;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationFactory;
-
-/**
- * <!-- begin-user-doc -->
- * A test case for the model object '<em><b>Child Rule</b></em>'.
- * <!-- end-user-doc -->
- * @generated
- */
-public class ChildRuleTest extends RuleTest {
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static void main(String[] args) {
-		TestRunner.run(ChildRuleTest.class);
-	}
-
-	/**
-	 * Constructs a new Child Rule test case with the given name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ChildRuleTest(String name) {
-		super(name);
-	}
-
-	/**
-	 * Returns the fixture for this Child Rule test case.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected ChildRule getFixture() {
-		return (ChildRule)fixture;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see junit.framework.TestCase#setUp()
-	 * @generated
-	 */
-	@Override
-	protected void setUp() throws Exception {
-		setFixture(ConfigurationFactory.eINSTANCE.createChildRule());
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see junit.framework.TestCase#tearDown()
-	 * @generated
-	 */
-	@Override
-	protected void tearDown() throws Exception {
-		setFixture(null);
-	}
-
-} //ChildRuleTest
diff --git a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/ConfigurationAllTests.java b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/ConfigurationAllTests.java
deleted file mode 100644
index 332295e07e7..00000000000
--- a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/ConfigurationAllTests.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * Copyright (c) 2015 Christian W. Damus and others.
- *
- *  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:
- *  Christian W. Damus - Initial API and implementation
- *
- *
- */
-package org.eclipse.papyrus.infra.viewpoints.configuration.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import junit.textui.TestRunner;
-
-/**
- * <!-- begin-user-doc -->
- * A test suite for the '<em><b>Configuration</b></em>' model.
- * <!-- end-user-doc -->
- * @generated
- */
-public class ConfigurationAllTests extends TestSuite {
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static void main(String[] args) {
-		TestRunner.run(suite());
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static Test suite() {
-		TestSuite suite = new ConfigurationAllTests("Configuration Tests");
-		suite.addTest(ConfigurationTests.suite());
-		return suite;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ConfigurationAllTests(String name) {
-		super(name);
-	}
-
-} //ConfigurationAllTests
diff --git a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/ConfigurationTests.java b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/ConfigurationTests.java
deleted file mode 100644
index f314c12ba3d..00000000000
--- a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/ConfigurationTests.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
- * Copyright (c) 2015 Christian W. Damus and others.
- *
- *  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:
- *  Christian W. Damus - Initial API and implementation
- *
- *
- */
-package org.eclipse.papyrus.infra.viewpoints.configuration.tests;
-
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage;
-import org.eclipse.papyrus.infra.viewpoints.configuration.impl.ConfigurationFactoryCustomImpl;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-/**
- * <!-- begin-user-doc -->
- * A test suite for the '<em><b>configuration</b></em>' package.
- * <!-- end-user-doc -->
- * 
- * @generated
- */
-public class ConfigurationTests extends TestSuite {
-
-	static {
-		final String packageURI = "http://www.eclipse.org/papyrus/infra/viewpoints/configuration";
-		EPackage.Registry.INSTANCE.put(packageURI, new EPackage.Descriptor() {
-
-			@Override
-			public EPackage getEPackage() {
-				return ConfigurationPackage.eINSTANCE;
-			}
-
-			@Override
-			public EFactory getEFactory() {
-				return new ConfigurationFactoryCustomImpl();
-			}
-		});
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public static void main(String[] args) {
-		TestRunner.run(suite());
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public static Test suite() {
-		TestSuite suite = new ConfigurationTests("configuration Tests");
-		suite.addTestSuite(PathElementTest.class);
-		suite.addTestSuite(ModelAutoCreateTest.class);
-		suite.addTestSuite(AssistantRuleTest.class);
-		return suite;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ConfigurationTests(String name) {
-		super(name);
-	}
-
-} //ConfigurationTests
diff --git a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/ModelAutoCreateTest.java b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/ModelAutoCreateTest.java
deleted file mode 100644
index 0fe7b25439d..00000000000
--- a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/ModelAutoCreateTest.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/**
- * Copyright (c) 2015 Christian W. Damus and others.
- *
- *  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:
- *  Christian W. Damus - Initial API and implementation
- *
- *
- */
-package org.eclipse.papyrus.infra.viewpoints.configuration.tests;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationFactory;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ModelAutoCreate;
-import org.eclipse.papyrus.infra.viewpoints.configuration.OwningRule;
-
-import junit.framework.TestCase;
-import junit.textui.TestRunner;
-
-/**
- * <!-- begin-user-doc -->
- * A test case for the model object '<em><b>Model Auto Create</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are tested:
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.ModelAutoCreate#getOrigin() <em>Origin</em>}</li>
- * </ul>
- * </p>
- * 
- * @generated
- */
-public class ModelAutoCreateTest extends TestCase {
-
-	/**
-	 * The fixture for this Model Auto Create test case.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected ModelAutoCreate fixture = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public static void main(String[] args) {
-		TestRunner.run(ModelAutoCreateTest.class);
-	}
-
-	/**
-	 * Constructs a new Model Auto Create test case with the given name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public ModelAutoCreateTest(String name) {
-		super(name);
-	}
-
-	/**
-	 * Sets the fixture for this Model Auto Create test case.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void setFixture(ModelAutoCreate fixture) {
-		this.fixture = fixture;
-	}
-
-	/**
-	 * Returns the fixture for this Model Auto Create test case.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected ModelAutoCreate getFixture() {
-		return fixture;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see junit.framework.TestCase#setUp()
-	 * @generated NOT
-	 */
-	@Override
-	protected void setUp() throws Exception {
-		OwningRule rule = ConfigurationFactory.eINSTANCE.createOwningRule();
-		rule.setElement(EcorePackage.Literals.EPACKAGE);
-
-		ModelAutoCreate fixture = ConfigurationFactory.eINSTANCE.createModelAutoCreate();
-		fixture.setCreationType("org.eclipse.papyrus.ecore.EClass");
-		fixture.setFeature(EcorePackage.Literals.EPACKAGE__ECLASSIFIERS);
-		rule.getNewModelPath().add(fixture);
-		setFixture(fixture);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see junit.framework.TestCase#tearDown()
-	 * @generated
-	 */
-	@Override
-	protected void tearDown() throws Exception {
-		setFixture(null);
-	}
-
-	/**
-	 * Tests the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.ModelAutoCreate#getOrigin() <em>Origin</em>}' feature getter.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.ModelAutoCreate#getOrigin()
-	 * @generated NOT
-	 */
-	public void testGetOrigin() {
-		assertThat(getFixture().getOrigin(), is(EcorePackage.Literals.EPACKAGE));
-
-		ModelAutoCreate path = ConfigurationFactory.eINSTANCE.createModelAutoCreate();
-		path.setFeature(EcorePackage.Literals.ECLASS__ESTRUCTURAL_FEATURES);
-		((OwningRule)getFixture().eContainer()).getNewModelPath().add(path);
-		assertThat(path.getOrigin(), not(EcorePackage.Literals.EPACKAGE));
-	}
-
-} //ModelAutoCreateTest
diff --git a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/ModelRuleTest.java b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/ModelRuleTest.java
deleted file mode 100644
index 17f86431875..00000000000
--- a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/ModelRuleTest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * Copyright (c) 2015 Christian W. Damus and others.
- *
- *  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:
- *  Christian W. Damus - Initial API and implementation
- *
- *
- */
-package org.eclipse.papyrus.infra.viewpoints.configuration.tests;
-
-import junit.textui.TestRunner;
-
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationFactory;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ModelRule;
-
-/**
- * <!-- begin-user-doc -->
- * A test case for the model object '<em><b>Model Rule</b></em>'.
- * <!-- end-user-doc -->
- * @generated
- */
-public class ModelRuleTest extends RuleTest {
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static void main(String[] args) {
-		TestRunner.run(ModelRuleTest.class);
-	}
-
-	/**
-	 * Constructs a new Model Rule test case with the given name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ModelRuleTest(String name) {
-		super(name);
-	}
-
-	/**
-	 * Returns the fixture for this Model Rule test case.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected ModelRule getFixture() {
-		return (ModelRule)fixture;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see junit.framework.TestCase#setUp()
-	 * @generated
-	 */
-	@Override
-	protected void setUp() throws Exception {
-		setFixture(ConfigurationFactory.eINSTANCE.createModelRule());
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see junit.framework.TestCase#tearDown()
-	 * @generated
-	 */
-	@Override
-	protected void tearDown() throws Exception {
-		setFixture(null);
-	}
-
-} //ModelRuleTest
diff --git a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/OwningRuleTest.java b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/OwningRuleTest.java
deleted file mode 100644
index 9a599371579..00000000000
--- a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/OwningRuleTest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * Copyright (c) 2015 Christian W. Damus and others.
- *
- *  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:
- *  Christian W. Damus - Initial API and implementation
- *
- *
- */
-package org.eclipse.papyrus.infra.viewpoints.configuration.tests;
-
-import junit.textui.TestRunner;
-
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationFactory;
-import org.eclipse.papyrus.infra.viewpoints.configuration.OwningRule;
-
-/**
- * <!-- begin-user-doc -->
- * A test case for the model object '<em><b>Owning Rule</b></em>'.
- * <!-- end-user-doc -->
- * @generated
- */
-public class OwningRuleTest extends RuleTest {
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static void main(String[] args) {
-		TestRunner.run(OwningRuleTest.class);
-	}
-
-	/**
-	 * Constructs a new Owning Rule test case with the given name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public OwningRuleTest(String name) {
-		super(name);
-	}
-
-	/**
-	 * Returns the fixture for this Owning Rule test case.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected OwningRule getFixture() {
-		return (OwningRule)fixture;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see junit.framework.TestCase#setUp()
-	 * @generated
-	 */
-	@Override
-	protected void setUp() throws Exception {
-		setFixture(ConfigurationFactory.eINSTANCE.createOwningRule());
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see junit.framework.TestCase#tearDown()
-	 * @generated
-	 */
-	@Override
-	protected void tearDown() throws Exception {
-		setFixture(null);
-	}
-
-} //OwningRuleTest
diff --git a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/PaletteRuleTest.java b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/PaletteRuleTest.java
deleted file mode 100644
index ed5795df110..00000000000
--- a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/PaletteRuleTest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * Copyright (c) 2015 Christian W. Damus and others.
- *
- *  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:
- *  Christian W. Damus - Initial API and implementation
- *
- *
- */
-package org.eclipse.papyrus.infra.viewpoints.configuration.tests;
-
-import junit.textui.TestRunner;
-
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationFactory;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PaletteRule;
-
-/**
- * <!-- begin-user-doc -->
- * A test case for the model object '<em><b>Palette Rule</b></em>'.
- * <!-- end-user-doc -->
- * @generated
- */
-public class PaletteRuleTest extends RuleTest {
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static void main(String[] args) {
-		TestRunner.run(PaletteRuleTest.class);
-	}
-
-	/**
-	 * Constructs a new Palette Rule test case with the given name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PaletteRuleTest(String name) {
-		super(name);
-	}
-
-	/**
-	 * Returns the fixture for this Palette Rule test case.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected PaletteRule getFixture() {
-		return (PaletteRule)fixture;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see junit.framework.TestCase#setUp()
-	 * @generated
-	 */
-	@Override
-	protected void setUp() throws Exception {
-		setFixture(ConfigurationFactory.eINSTANCE.createPaletteRule());
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see junit.framework.TestCase#tearDown()
-	 * @generated
-	 */
-	@Override
-	protected void tearDown() throws Exception {
-		setFixture(null);
-	}
-
-} //PaletteRuleTest
diff --git a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/PapyrusConfigurationTest.java b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/PapyrusConfigurationTest.java
deleted file mode 100644
index 82948122af8..00000000000
--- a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/PapyrusConfigurationTest.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- * Copyright (c) 2015 Christian W. Damus and others.
- *
- *  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:
- *  Christian W. Damus - Initial API and implementation
- *
- *
- */
-package org.eclipse.papyrus.infra.viewpoints.configuration.tests;
-
-import junit.framework.TestCase;
-
-import junit.textui.TestRunner;
-
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationFactory;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusConfiguration;
-
-/**
- * <!-- begin-user-doc -->
- * A test case for the model object '<em><b>Papyrus Configuration</b></em>'.
- * <!-- end-user-doc -->
- * @generated
- */
-public class PapyrusConfigurationTest extends TestCase {
-
-	/**
-	 * The fixture for this Papyrus Configuration test case.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PapyrusConfiguration fixture = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static void main(String[] args) {
-		TestRunner.run(PapyrusConfigurationTest.class);
-	}
-
-	/**
-	 * Constructs a new Papyrus Configuration test case with the given name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PapyrusConfigurationTest(String name) {
-		super(name);
-	}
-
-	/**
-	 * Sets the fixture for this Papyrus Configuration test case.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void setFixture(PapyrusConfiguration fixture) {
-		this.fixture = fixture;
-	}
-
-	/**
-	 * Returns the fixture for this Papyrus Configuration test case.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PapyrusConfiguration getFixture() {
-		return fixture;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see junit.framework.TestCase#setUp()
-	 * @generated
-	 */
-	@Override
-	protected void setUp() throws Exception {
-		setFixture(ConfigurationFactory.eINSTANCE.createPapyrusConfiguration());
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see junit.framework.TestCase#tearDown()
-	 * @generated
-	 */
-	@Override
-	protected void tearDown() throws Exception {
-		setFixture(null);
-	}
-
-} //PapyrusConfigurationTest
diff --git a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/PapyrusDiagramTest.java b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/PapyrusDiagramTest.java
deleted file mode 100644
index e69cd7447d0..00000000000
--- a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/PapyrusDiagramTest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * Copyright (c) 2015 Christian W. Damus and others.
- *
- *  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:
- *  Christian W. Damus - Initial API and implementation
- *
- *
- */
-package org.eclipse.papyrus.infra.viewpoints.configuration.tests;
-
-import junit.textui.TestRunner;
-
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationFactory;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusDiagram;
-
-/**
- * <!-- begin-user-doc -->
- * A test case for the model object '<em><b>Papyrus Diagram</b></em>'.
- * <!-- end-user-doc -->
- * @generated
- */
-public class PapyrusDiagramTest extends PapyrusViewTest {
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static void main(String[] args) {
-		TestRunner.run(PapyrusDiagramTest.class);
-	}
-
-	/**
-	 * Constructs a new Papyrus Diagram test case with the given name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PapyrusDiagramTest(String name) {
-		super(name);
-	}
-
-	/**
-	 * Returns the fixture for this Papyrus Diagram test case.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected PapyrusDiagram getFixture() {
-		return (PapyrusDiagram)fixture;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see junit.framework.TestCase#setUp()
-	 * @generated
-	 */
-	@Override
-	protected void setUp() throws Exception {
-		setFixture(ConfigurationFactory.eINSTANCE.createPapyrusDiagram());
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see junit.framework.TestCase#tearDown()
-	 * @generated
-	 */
-	@Override
-	protected void tearDown() throws Exception {
-		setFixture(null);
-	}
-
-} //PapyrusDiagramTest
diff --git a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/PapyrusSyncTableTest.java b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/PapyrusSyncTableTest.java
deleted file mode 100644
index f142f7ac3c8..00000000000
--- a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/PapyrusSyncTableTest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * Copyright (c) 2015 Christian W. Damus and others.
- *
- *  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:
- *  Christian W. Damus - Initial API and implementation
- *
- *
- */
-package org.eclipse.papyrus.infra.viewpoints.configuration.tests;
-
-import junit.textui.TestRunner;
-
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationFactory;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusSyncTable;
-
-/**
- * <!-- begin-user-doc -->
- * A test case for the model object '<em><b>Papyrus Sync Table</b></em>'.
- * <!-- end-user-doc -->
- * @generated
- */
-public class PapyrusSyncTableTest extends PapyrusViewTest {
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static void main(String[] args) {
-		TestRunner.run(PapyrusSyncTableTest.class);
-	}
-
-	/**
-	 * Constructs a new Papyrus Sync Table test case with the given name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PapyrusSyncTableTest(String name) {
-		super(name);
-	}
-
-	/**
-	 * Returns the fixture for this Papyrus Sync Table test case.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected PapyrusSyncTable getFixture() {
-		return (PapyrusSyncTable)fixture;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see junit.framework.TestCase#setUp()
-	 * @generated
-	 */
-	@Override
-	protected void setUp() throws Exception {
-		setFixture(ConfigurationFactory.eINSTANCE.createPapyrusSyncTable());
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see junit.framework.TestCase#tearDown()
-	 * @generated
-	 */
-	@Override
-	protected void tearDown() throws Exception {
-		setFixture(null);
-	}
-
-} //PapyrusSyncTableTest
diff --git a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/PapyrusTableTest.java b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/PapyrusTableTest.java
deleted file mode 100644
index 695de31c290..00000000000
--- a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/PapyrusTableTest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * Copyright (c) 2015 Christian W. Damus and others.
- *
- *  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:
- *  Christian W. Damus - Initial API and implementation
- *
- *
- */
-package org.eclipse.papyrus.infra.viewpoints.configuration.tests;
-
-import junit.textui.TestRunner;
-
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationFactory;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusTable;
-
-/**
- * <!-- begin-user-doc -->
- * A test case for the model object '<em><b>Papyrus Table</b></em>'.
- * <!-- end-user-doc -->
- * @generated
- */
-public class PapyrusTableTest extends PapyrusViewTest {
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static void main(String[] args) {
-		TestRunner.run(PapyrusTableTest.class);
-	}
-
-	/**
-	 * Constructs a new Papyrus Table test case with the given name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PapyrusTableTest(String name) {
-		super(name);
-	}
-
-	/**
-	 * Returns the fixture for this Papyrus Table test case.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected PapyrusTable getFixture() {
-		return (PapyrusTable)fixture;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see junit.framework.TestCase#setUp()
-	 * @generated
-	 */
-	@Override
-	protected void setUp() throws Exception {
-		setFixture(ConfigurationFactory.eINSTANCE.createPapyrusTable());
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see junit.framework.TestCase#tearDown()
-	 * @generated
-	 */
-	@Override
-	protected void tearDown() throws Exception {
-		setFixture(null);
-	}
-
-} //PapyrusTableTest
diff --git a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/PapyrusViewTest.java b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/PapyrusViewTest.java
deleted file mode 100644
index 7b42dcb2e2d..00000000000
--- a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/PapyrusViewTest.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- * Copyright (c) 2015 Christian W. Damus and others.
- *
- *  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:
- *  Christian W. Damus - Initial API and implementation
- *
- *
- */
-package org.eclipse.papyrus.infra.viewpoints.configuration.tests;
-
-import junit.framework.TestCase;
-
-import junit.textui.TestRunner;
-
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationFactory;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusView;
-
-/**
- * <!-- begin-user-doc -->
- * A test case for the model object '<em><b>Papyrus View</b></em>'.
- * <!-- end-user-doc -->
- * @generated
- */
-public class PapyrusViewTest extends TestCase {
-
-	/**
-	 * The fixture for this Papyrus View test case.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PapyrusView fixture = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static void main(String[] args) {
-		TestRunner.run(PapyrusViewTest.class);
-	}
-
-	/**
-	 * Constructs a new Papyrus View test case with the given name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PapyrusViewTest(String name) {
-		super(name);
-	}
-
-	/**
-	 * Sets the fixture for this Papyrus View test case.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void setFixture(PapyrusView fixture) {
-		this.fixture = fixture;
-	}
-
-	/**
-	 * Returns the fixture for this Papyrus View test case.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PapyrusView getFixture() {
-		return fixture;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see junit.framework.TestCase#setUp()
-	 * @generated
-	 */
-	@Override
-	protected void setUp() throws Exception {
-		setFixture(ConfigurationFactory.eINSTANCE.createPapyrusView());
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see junit.framework.TestCase#tearDown()
-	 * @generated
-	 */
-	@Override
-	protected void tearDown() throws Exception {
-		setFixture(null);
-	}
-
-} //PapyrusViewTest
diff --git a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/PapyrusViewpointTest.java b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/PapyrusViewpointTest.java
deleted file mode 100644
index 0c58870c7f4..00000000000
--- a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/PapyrusViewpointTest.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- * Copyright (c) 2015 Christian W. Damus and others.
- *
- *  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:
- *  Christian W. Damus - Initial API and implementation
- *
- *
- */
-package org.eclipse.papyrus.infra.viewpoints.configuration.tests;
-
-import junit.framework.TestCase;
-
-import junit.textui.TestRunner;
-
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationFactory;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PapyrusViewpoint;
-
-/**
- * <!-- begin-user-doc -->
- * A test case for the model object '<em><b>Papyrus Viewpoint</b></em>'.
- * <!-- end-user-doc -->
- * @generated
- */
-public class PapyrusViewpointTest extends TestCase {
-
-	/**
-	 * The fixture for this Papyrus Viewpoint test case.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PapyrusViewpoint fixture = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static void main(String[] args) {
-		TestRunner.run(PapyrusViewpointTest.class);
-	}
-
-	/**
-	 * Constructs a new Papyrus Viewpoint test case with the given name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PapyrusViewpointTest(String name) {
-		super(name);
-	}
-
-	/**
-	 * Sets the fixture for this Papyrus Viewpoint test case.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void setFixture(PapyrusViewpoint fixture) {
-		this.fixture = fixture;
-	}
-
-	/**
-	 * Returns the fixture for this Papyrus Viewpoint test case.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PapyrusViewpoint getFixture() {
-		return fixture;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see junit.framework.TestCase#setUp()
-	 * @generated
-	 */
-	@Override
-	protected void setUp() throws Exception {
-		setFixture(ConfigurationFactory.eINSTANCE.createPapyrusViewpoint());
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see junit.framework.TestCase#tearDown()
-	 * @generated
-	 */
-	@Override
-	protected void tearDown() throws Exception {
-		setFixture(null);
-	}
-
-} //PapyrusViewpointTest
diff --git a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/PathElementTest.java b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/PathElementTest.java
deleted file mode 100644
index 2f5ee144a61..00000000000
--- a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/PathElementTest.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/**
- * Copyright (c) 2015 Christian W. Damus and others.
- *
- *  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:
- *  Christian W. Damus - Initial API and implementation
- *
- *
- */
-package org.eclipse.papyrus.infra.viewpoints.configuration.tests;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ChildRule;
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationFactory;
-import org.eclipse.papyrus.infra.viewpoints.configuration.PathElement;
-
-import junit.framework.TestCase;
-import junit.textui.TestRunner;
-
-/**
- * <!-- begin-user-doc -->
- * A test case for the model object '<em><b>Path Element</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are tested:
- * <ul>
- * <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.PathElement#getOrigin() <em>Origin</em>}</li>
- * <li>{@link org.eclipse.papyrus.infra.viewpoints.configuration.PathElement#getTarget() <em>Target</em>}</li>
- * </ul>
- * </p>
- * 
- * @generated
- */
-public class PathElementTest extends TestCase {
-
-	/**
-	 * The fixture for this Path Element test case.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected PathElement fixture = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public static void main(String[] args) {
-		TestRunner.run(PathElementTest.class);
-	}
-
-	/**
-	 * Constructs a new Path Element test case with the given name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public PathElementTest(String name) {
-		super(name);
-	}
-
-	/**
-	 * Sets the fixture for this Path Element test case.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void setFixture(PathElement fixture) {
-		this.fixture = fixture;
-	}
-
-	/**
-	 * Returns the fixture for this Path Element test case.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected PathElement getFixture() {
-		return fixture;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see junit.framework.TestCase#setUp()
-	 * @generated NOT
-	 */
-	@Override
-	protected void setUp() throws Exception {
-		ChildRule childRule = ConfigurationFactory.eINSTANCE.createChildRule();
-		childRule.setOrigin(EcorePackage.Literals.EATTRIBUTE);
-
-		// Set a type.ePackage.eAnnotations.references path
-		PathElement path = ConfigurationFactory.eINSTANCE.createPathElement();
-		path.setFeature(EcorePackage.Literals.EATTRIBUTE__EATTRIBUTE_TYPE);
-		childRule.getInsertionPath().add(path);
-		path = ConfigurationFactory.eINSTANCE.createPathElement();
-		path.setFeature(EcorePackage.Literals.ECLASSIFIER__EPACKAGE);
-		childRule.getInsertionPath().add(path);
-		path = ConfigurationFactory.eINSTANCE.createPathElement();
-		path.setFeature(EcorePackage.Literals.EMODEL_ELEMENT__EANNOTATIONS);
-		childRule.getInsertionPath().add(path);
-
-		PathElement fixture = ConfigurationFactory.eINSTANCE.createPathElement();
-		fixture.setFeature(EcorePackage.Literals.EANNOTATION__REFERENCES);
-		childRule.getInsertionPath().add(fixture);
-
-		setFixture(fixture);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see junit.framework.TestCase#tearDown()
-	 * @generated
-	 */
-	@Override
-	protected void tearDown() throws Exception {
-		setFixture(null);
-	}
-
-	/**
-	 * Tests the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PathElement#getOrigin() <em>Origin</em>}' feature getter.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.PathElement#getOrigin()
-	 * @generated NOT
-	 */
-	public void testGetOrigin() {
-		assertThat(getFixture().getOrigin(), is(EcorePackage.Literals.EANNOTATION));
-	}
-
-	/**
-	 * Tests the '{@link org.eclipse.papyrus.infra.viewpoints.configuration.PathElement#getTarget() <em>Target</em>}' feature getter.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @see org.eclipse.papyrus.infra.viewpoints.configuration.PathElement#getTarget()
-	 * @generated NOT
-	 */
-	public void testGetTarget() {
-		assertThat(getFixture().getTarget(), is(EcorePackage.Literals.EOBJECT));
-	}
-
-} //PathElementTest
diff --git a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/RootAutoSelectTest.java b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/RootAutoSelectTest.java
deleted file mode 100644
index d0e40fe71b6..00000000000
--- a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/RootAutoSelectTest.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- * Copyright (c) 2015 Christian W. Damus and others.
- *
- *  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:
- *  Christian W. Damus - Initial API and implementation
- *
- *
- */
-package org.eclipse.papyrus.infra.viewpoints.configuration.tests;
-
-import junit.framework.TestCase;
-
-import junit.textui.TestRunner;
-
-import org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationFactory;
-import org.eclipse.papyrus.infra.viewpoints.configuration.RootAutoSelect;
-
-/**
- * <!-- begin-user-doc -->
- * A test case for the model object '<em><b>Root Auto Select</b></em>'.
- * <!-- end-user-doc -->
- * @generated
- */
-public class RootAutoSelectTest extends TestCase {
-
-	/**
-	 * The fixture for this Root Auto Select test case.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected RootAutoSelect fixture = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static void main(String[] args) {
-		TestRunner.run(RootAutoSelectTest.class);
-	}
-
-	/**
-	 * Constructs a new Root Auto Select test case with the given name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RootAutoSelectTest(String name) {
-		super(name);
-	}
-
-	/**
-	 * Sets the fixture for this Root Auto Select test case.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void setFixture(RootAutoSelect fixture) {
-		this.fixture = fixture;
-	}
-
-	/**
-	 * Returns the fixture for this Root Auto Select test case.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected RootAutoSelect getFixture() {
-		return fixture;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see junit.framework.TestCase#setUp()
-	 * @generated
-	 */
-	@Override
-	protected void setUp() throws Exception {
-		setFixture(ConfigurationFactory.eINSTANCE.createRootAutoSelect());
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see junit.framework.TestCase#tearDown()
-	 * @generated
-	 */
-	@Override
-	protected void tearDown() throws Exception {
-		setFixture(null);
-	}
-
-} //RootAutoSelectTest
diff --git a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/RuleTest.java b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/RuleTest.java
deleted file mode 100644
index 6c6ce4e8a58..00000000000
--- a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src-gen/org/eclipse/papyrus/infra/viewpoints/configuration/tests/RuleTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * Copyright (c) 2015 Christian W. Damus and others.
- *
- *  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:
- *  Christian W. Damus - Initial API and implementation
- *
- *
- */
-package org.eclipse.papyrus.infra.viewpoints.configuration.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.papyrus.infra.viewpoints.configuration.Rule;
-
-/**
- * <!-- begin-user-doc -->
- * A test case for the model object '<em><b>Rule</b></em>'.
- * <!-- end-user-doc -->
- * @generated
- */
-public abstract class RuleTest extends TestCase {
-
-	/**
-	 * The fixture for this Rule test case.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Rule fixture = null;
-
-	/**
-	 * Constructs a new Rule test case with the given name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RuleTest(String name) {
-		super(name);
-	}
-
-	/**
-	 * Sets the fixture for this Rule test case.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void setFixture(Rule fixture) {
-		this.fixture = fixture;
-	}
-
-	/**
-	 * Returns the fixture for this Rule test case.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Rule getFixture() {
-		return fixture;
-	}
-
-} //RuleTest
diff --git a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src/org/eclipse/papyrus/infra/viewpoints/configuration/tests/AllTests.java b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src/org/eclipse/papyrus/infra/viewpoints/configuration/tests/AllTests.java
deleted file mode 100644
index 7f24f4342c6..00000000000
--- a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration.tests/src/org/eclipse/papyrus/infra/viewpoints/configuration/tests/AllTests.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2015, 2016 Christian W. Damus and others.
- * 
- * 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:
- *   Christian W. Damus - Initial API and implementation
- *   
- *****************************************************************************/
-
-package org.eclipse.papyrus.infra.viewpoints.configuration.tests;
-
-import org.eclipse.papyrus.junit.framework.classification.ClassificationSuite;
-import org.eclipse.papyrus.junit.framework.runner.Headless;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite.SuiteClasses;
-
-/**
- * The master test suite for the plug-in.
- */
-@RunWith(ClassificationSuite.class)
-@SuiteClasses(ConfigurationAllTests.class)
-@Headless
-public class AllTests {
-	// Nothing required
-}
diff --git a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy.tests/META-INF/MANIFEST.MF
index 5f9968f36b8..cc2ca5dc227 100644
--- a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,6 @@ Manifest-Version: 1.0
 Export-Package: org.eclipse.papyrus.infra.viewpoints.policy.tests
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.11.0",
  org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.viewpoints.iso42010;bundle-version="1.2.0";visibility:=reexport,
  org.eclipse.emf.ecore.xmi;bundle-version="2.11.0";visibility:=reexport,
  org.junit;bundle-version="4.11.0";visibility:=reexport,
  org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.9.0",
diff --git a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy.tests/src/org/eclipse/papyrus/infra/viewpoints/policy/tests/ViewPrototypeTest.java b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy.tests/src/org/eclipse/papyrus/infra/viewpoints/policy/tests/ViewPrototypeTest.java
index a45f49c8b27..7309658bdd7 100644
--- a/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy.tests/src/org/eclipse/papyrus/infra/viewpoints/policy/tests/ViewPrototypeTest.java
+++ b/tests/junit/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy.tests/src/org/eclipse/papyrus/infra/viewpoints/policy/tests/ViewPrototypeTest.java
@@ -32,9 +32,7 @@ import org.eclipse.papyrus.junit.utils.rules.PluginResource;
 import org.eclipse.papyrus.junit.utils.rules.ServiceRegistryModelSetFixture;
 import org.eclipse.uml2.uml.BehavioredClassifier;
 import org.eclipse.uml2.uml.StateMachine;
-import org.junit.AfterClass;
 import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -78,30 +76,14 @@ public class ViewPrototypeTest {
 	// Test framework
 	//
 
-	/**
-	 * Ensure that these tests operate under the default viewpoint configuration,
-	 * no matter what.
-	 */
-	@BeforeClass
-	public static void setDefaultViewpoint() {
-		policyToRestore = PolicyChecker.getCurrent();
-		PolicyChecker.setCurrent(new PolicyChecker(false));
-	}
-
 	@Before
 	public void getModelElements() {
 		class1_stateMachine1 = (StateMachine) ((BehavioredClassifier) modelSet.getModel().getOwnedType("Class1")).getClassifierBehavior();
 		class2_stateMachine1 = (StateMachine) ((BehavioredClassifier) modelSet.getModel().getOwnedType("Class2")).getClassifierBehavior();
 	}
 
-	@AfterClass
-	public static void restoreViewpoint() {
-		PolicyChecker.setCurrent(policyToRestore);
-		policyToRestore = null;
-	}
-
 	List<ViewPrototype> getApplicableViewPrototypes(EObject object) {
-		Collection<ViewPrototype> result = PolicyChecker.getCurrent().getPrototypesFor(object);
+		Collection<ViewPrototype> result = PolicyChecker.getFor(object).getPrototypesFor(object);
 
 		// Only one diagram, so there must be only one prototype
 		assertThat(result.size(), greaterThan(0));
diff --git a/tests/junit/plugins/infra/viewpoints/pom.xml b/tests/junit/plugins/infra/viewpoints/pom.xml
index 32da38e7c94..ada1e0d28c6 100755
--- a/tests/junit/plugins/infra/viewpoints/pom.xml
+++ b/tests/junit/plugins/infra/viewpoints/pom.xml
@@ -15,7 +15,6 @@
 	<description>Tests for infra viewpoints role-based viewpoints customizing the UI experience.</description>
   
   <modules>
-	<module>org.eclipse.papyrus.infra.viewpoints.configuration.tests</module>
 	<module>org.eclipse.papyrus.infra.viewpoints.policy.tests</module>
 		
   </modules>
diff --git a/tests/junit/plugins/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF
index 910f3472ecd..3754dae8daa 100644
--- a/tests/junit/plugins/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/org.eclipse.papyrus.tests/META-INF/MANIFEST.MF
@@ -18,7 +18,6 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.views.modelexplorer.tests;bundle-version="1.2.0",
  org.eclipse.papyrus.editor.integration.tests;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.services.resourceloading.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.search.tests;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.gmfdiag.css.tests;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.gmfdiag.menu.tests;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.services.controlmode.tests;bundle-version="1.2.0",
@@ -76,7 +75,6 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.nattable.model.tests;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.gmfdiag.canonical.tests;bundle-version="1.2.0",
  org.eclipse.papyrus.uml.textedit.valuespecification.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.viewpoints.configuration.tests;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.core.clipboard.tests;bundle-version="1.2.0",
  org.eclipse.papyrus.uml.nattable.stereotype.display.tests;bundle-version="1.2.0",
  org.eclipse.papyrus.tests.framework;bundle-version="1.2.0",
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/model/ModelWithBDD.di b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/model/ModelWithBDD.di
index 3b41d552d1e..f1a1021f136 100644
--- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/model/ModelWithBDD.di
+++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/model/ModelWithBDD.di
@@ -1,17 +1,24 @@
-<?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="ModelWithBDD.notation#_LXISYJdgEeCIWccnqNjPug"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="ModelWithBDD.notation#_LXISYJdgEeCIWccnqNjPug"/>

-        </children>

-      </children>

-    </windows>

-  </sashModel>

-</di:SashWindowsMngr>

+<?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:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
+  <di:SashWindowsMngr>
+    <pageList>
+      <availablePage>
+        <emfPageIdentifier href="ModelWithBDD.notation#_LXISYJdgEeCIWccnqNjPug"/>
+      </availablePage>
+    </pageList>
+    <sashModel currentSelection="/0/@sashModel/@windows.0/@children.0">
+      <windows>
+        <children xsi:type="di:TabFolder">
+          <children>
+            <emfPageIdentifier href="ModelWithBDD.notation#_LXISYJdgEeCIWccnqNjPug"/>
+          </children>
+        </children>
+      </windows>
+    </sashModel>
+  </di:SashWindowsMngr>
+  <architecture:ArchitectureDescription contextId="org.eclipse.papyrus.sysml.architecture.SysML"/>
+  <architecture:ArchitectureDescriptionPreferences>
+    <viewpointIds>org.eclipse.papyrus.sysml.analysis</viewpointIds>
+    <viewpointIds>org.eclipse.papyrus.sysml.design</viewpointIds>
+  </architecture:ArchitectureDescriptionPreferences>
+</xmi:XMI>
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.launch b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.launch
index 629359dc71c..737881209ca 100644
--- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.launch
+++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.launch
@@ -1,42 +1,45 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">

-<booleanAttribute key="append.args" value="true"/>

-<booleanAttribute key="askclear" value="false"/>

-<booleanAttribute key="automaticAdd" value="true"/>

-<booleanAttribute key="automaticValidate" value="false"/>

-<stringAttribute key="bootstrap" value=""/>

-<stringAttribute key="checked" value="[NONE]"/>

-<booleanAttribute key="clearConfig" value="true"/>

-<booleanAttribute key="clearws" value="true"/>

-<booleanAttribute key="clearwslog" value="false"/>

-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>

-<booleanAttribute key="default" value="true"/>

-<booleanAttribute key="includeOptional" value="true"/>

-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

-<listEntry value="/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/suites/AllTests.java"/>

-</listAttribute>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

-<listEntry value="1"/>

-</listAttribute>

-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>

-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>

-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>

-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>

-<stringAttribute key="org.eclipse.jdt.launching.JAVA_COMMAND" value="java"/>

-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>

-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.suites.AllTests"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.sysml.diagram.blockdefinition.tests"/>

-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx4096m -XX:+CMSClassUnloadingEnabled"/>

-<stringAttribute key="pde.version" value="3.3"/>

-<stringAttribute key="product" value="org.eclipse.sdk.ide"/>

-<booleanAttribute key="run_in_ui_thread" value="true"/>

-<booleanAttribute key="show_selected_only" value="false"/>

-<booleanAttribute key="tracing" value="false"/>

-<booleanAttribute key="useCustomFeatures" value="false"/>

-<booleanAttribute key="useDefaultConfig" value="true"/>

-<booleanAttribute key="useDefaultConfigArea" value="false"/>

-<booleanAttribute key="useProduct" value="true"/>

-</launchConfiguration>

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="false"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/suites/AllTests.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.JAVA_COMMAND" value="java"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.suites.AllTests"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.sysml.diagram.blockdefinition.tests"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx4096m -XX:+CMSClassUnloadingEnabled"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
+<booleanAttribute key="run_in_ui_thread" value="true"/>
+<stringAttribute key="selected_target_plugins" value="ca.odell.glazedlists@default:default,ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.google.gerrit.common@default:default,com.google.gerrit.prettify@default:default,com.google.gerrit.reviewdb@default:default,com.google.gson@default:default,com.google.guava@default:default,com.google.gwt.servlet@default:default,com.google.gwtjsonrpc@default:default,com.google.gwtorm@default:default,com.google.inject.multibindings@default:false,com.google.inject@default:default,com.gradleware.tooling.client@default:default,com.gradleware.tooling.model@default:default,com.gradleware.tooling.utils@default:default,com.ibm.icu@default:default,com.jcraft.jsch@default:default,com.sun.el@default:default,fr.obeo.releng.targetplatform.ui@default:default,fr.obeo.releng.targetplatform@default:default,javaewah@default:default,javax.annotation@default:default,javax.el@default:default,javax.inject@default:default,javax.servlet*3.0.0.v201112011016@default:default,javax.servlet*3.1.0.v201410161800@default:default,javax.servlet.jsp@default:default,javax.xml@default:default,lpg.runtime.java@default:default,net.sourceforge.nattable.core@default:default,org.antlr.runtime*3.2.0.v201101311130@default:default,org.antlr.runtime*4.3.0.v201502022030@default:default,org.apache.ant@default:default,org.apache.batik.bridge@default:default,org.apache.batik.css*1.6.0.v201011041432@default:default,org.apache.batik.css*1.7.0.v201011041433@default:default,org.apache.batik.dom.svg@default:default,org.apache.batik.dom@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.parser@default:default,org.apache.batik.pdf@default:default,org.apache.batik.svggen@default:default,org.apache.batik.transcoder@default:default,org.apache.batik.util*1.6.0.v201011041432@default:default,org.apache.batik.util*1.7.0.v201011041433@default:default,org.apache.batik.util.gui*1.6.0.v201011041432@default:default,org.apache.batik.util.gui*1.7.0.v200903091627@default:default,org.apache.batik.xml@default:default,org.apache.commons.cli@default:default,org.apache.commons.codec@default:default,org.apache.commons.compress@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.io@default:default,org.apache.commons.jxpath*1.2.0.v20080604-1500@default:default,org.apache.commons.jxpath*1.3.0.v200911051830@default:default,org.apache.commons.lang3@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.commons.math@default:default,org.apache.commons.pool@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.httpcomponents.httpclient*4.3.6.v201411290715@default:default,org.apache.httpcomponents.httpclient*4.3.6.v201511171540@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.jasper.glassfish@default:default,org.apache.log4j@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.apache.solr.client.solrj@default:default,org.apache.ws.commons.util@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.apache.xmlrpc@default:default,org.eclipse.acceleo.annotations@default:default,org.eclipse.acceleo.common.ide@default:default,org.eclipse.acceleo.common.ui@default:default,org.eclipse.acceleo.common@default:default,org.eclipse.acceleo.engine@default:default,org.eclipse.acceleo.ide.ui@default:default,org.eclipse.acceleo.model@default:default,org.eclipse.acceleo.parser@default:default,org.eclipse.acceleo.profiler@default:default,org.eclipse.acceleo.query@default:default,org.eclipse.acceleo.traceability.model@default:default,org.eclipse.acceleo.traceability@default:default,org.eclipse.acceleo.ui.interpreter@default:default,org.eclipse.aether.api@default:default,org.eclipse.aether.connector.basic@default:default,org.eclipse.aether.impl@default:default,org.eclipse.aether.maven@default:default,org.eclipse.aether.spi@default:default,org.eclipse.aether.transport.file@default:default,org.eclipse.aether.transport.http@default:default,org.eclipse.aether.util@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.b3.aggregator.edit@default:default,org.eclipse.b3.aggregator.editor@default:default,org.eclipse.b3.aggregator.engine.maven@default:default,org.eclipse.b3.aggregator.engine@default:default,org.eclipse.b3.aggregator.legacy.ui@default:default,org.eclipse.b3.aggregator.legacy@default:default,org.eclipse.b3.aggregator@default:default,org.eclipse.b3.cli@default:default,org.eclipse.b3.p2.edit@default:default,org.eclipse.b3.p2.maven.indexer@default:default,org.eclipse.b3.p2.maven@default:default,org.eclipse.b3.p2@default:default,org.eclipse.b3.util@default:default,org.eclipse.buckminster.osgi.filter@default:default,org.eclipse.buildship.branding@default:default,org.eclipse.buildship.core@default:default,org.eclipse.buildship.stsmigration@default:default,org.eclipse.buildship.ui@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.cvs@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.draw2d.doc.isv@default:default,org.eclipse.draw2d@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.emf.xpath@default:default,org.eclipse.e4.tools.compat@default:default,org.eclipse.e4.tools.emf.editor3x@default:default,org.eclipse.e4.tools.emf.ui@default:default,org.eclipse.e4.tools.jdt.templates@default:default,org.eclipse.e4.tools.services@default:default,org.eclipse.e4.tools@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.dialogs@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt.cocoa@default:false,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.httpclient4.ssl@default:false,org.eclipse.ecf.provider.filetransfer.httpclient4@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.eef.common.ui@default:default,org.eclipse.eef.common@default:default,org.eclipse.eef.core.ext.widgets.reference@default:default,org.eclipse.eef.core@default:default,org.eclipse.eef.ext.widgets.reference@default:default,org.eclipse.eef.ide.ui.ext.widgets.reference@default:default,org.eclipse.eef.ide.ui.properties@default:default,org.eclipse.eef.ide.ui@default:default,org.eclipse.eef.ide@default:default,org.eclipse.eef.properties.ui.legacy@default:default,org.eclipse.eef.properties.ui@default:default,org.eclipse.eef@default:default,org.eclipse.egit.core@default:default,org.eclipse.egit.doc@default:default,org.eclipse.egit.mylyn.ui@default:default,org.eclipse.egit.ui@default:default,org.eclipse.egit@default:default,org.eclipse.emf.ant@default:default,org.eclipse.emf.cdo.admin@default:default,org.eclipse.emf.cdo.common.db@default:default,org.eclipse.emf.cdo.common@default:default,org.eclipse.emf.cdo.compare@default:default,org.eclipse.emf.cdo.defs@default:default,org.eclipse.emf.cdo.doc@default:default,org.eclipse.emf.cdo.ecore.retrofit@default:false,org.eclipse.emf.cdo.edit@default:default,org.eclipse.emf.cdo.examples.installer@default:default,org.eclipse.emf.cdo.explorer.ui@default:default,org.eclipse.emf.cdo.explorer@default:default,org.eclipse.emf.cdo.expressions.edit@default:default,org.eclipse.emf.cdo.expressions.editor@default:default,org.eclipse.emf.cdo.expressions@default:default,org.eclipse.emf.cdo.migrator@default:default,org.eclipse.emf.cdo.net4j@default:default,org.eclipse.emf.cdo.sdk@default:default,org.eclipse.emf.cdo.security.edit@default:default,org.eclipse.emf.cdo.security.editor@default:default,org.eclipse.emf.cdo.security.ui@default:default,org.eclipse.emf.cdo.security@default:default,org.eclipse.emf.cdo.server.admin@default:default,org.eclipse.emf.cdo.server.db@default:default,org.eclipse.emf.cdo.server.lissome@default:default,org.eclipse.emf.cdo.server.mongodb@default:default,org.eclipse.emf.cdo.server.net4j@default:default,org.eclipse.emf.cdo.server.ocl@default:default,org.eclipse.emf.cdo.server.product@default:default,org.eclipse.emf.cdo.server.security@default:default,org.eclipse.emf.cdo.server@default:default,org.eclipse.emf.cdo.transfer.repository@default:default,org.eclipse.emf.cdo.transfer.ui@default:default,org.eclipse.emf.cdo.transfer.workspace.ui@default:default,org.eclipse.emf.cdo.transfer.workspace@default:default,org.eclipse.emf.cdo.transfer@default:default,org.eclipse.emf.cdo.ui.admin@default:default,org.eclipse.emf.cdo.ui.compare@default:default,org.eclipse.emf.cdo.ui.defs@default:default,org.eclipse.emf.cdo.ui.shared@default:default,org.eclipse.emf.cdo.ui.team@default:default,org.eclipse.emf.cdo.ui@default:default,org.eclipse.emf.cdo.workspace@default:default,org.eclipse.emf.cdo@default:default,org.eclipse.emf.cheatsheets@default:default,org.eclipse.emf.codegen.ecore.ui@default:default,org.eclipse.emf.codegen.ecore.xtext@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.codegen.ui@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.compare.diagram.edit@default:default,org.eclipse.emf.compare.diagram.ide.ui.papyrus@default:default,org.eclipse.emf.compare.diagram.ide.ui@default:default,org.eclipse.emf.compare.diagram.papyrus@default:default,org.eclipse.emf.compare.diagram@default:default,org.eclipse.emf.compare.doc@default:default,org.eclipse.emf.compare.edit@default:default,org.eclipse.emf.compare.egit.ui@default:default,org.eclipse.emf.compare.egit@default:default,org.eclipse.emf.compare.ide.ui@default:default,org.eclipse.emf.compare.ide@default:default,org.eclipse.emf.compare.rcp.ui@default:default,org.eclipse.emf.compare.rcp@default:default,org.eclipse.emf.compare.uml2.edit.papyrus@default:default,org.eclipse.emf.compare.uml2.edit@default:default,org.eclipse.emf.compare.uml2.rcp.ui@default:default,org.eclipse.emf.compare.uml2.rcp@default:default,org.eclipse.emf.compare.uml2@default:default,org.eclipse.emf.compare@default:default,org.eclipse.emf.converter@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.doc@default:default,org.eclipse.emf.ecore.change.edit@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.emf.ecore.xcore.lib@default:default,org.eclipse.emf.ecore.xcore@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.eef.runtime@default:default,org.eclipse.emf.example.installer@default:default,org.eclipse.emf.examples.library@default:default,org.eclipse.emf.exporter@default:default,org.eclipse.emf.facet.aggregate.doc@default:default,org.eclipse.emf.facet.aggregate.metamodel.notgenerated@default:default,org.eclipse.emf.facet.aggregate.metamodel@default:default,org.eclipse.emf.facet.aggregate.tests@default:default,org.eclipse.emf.facet.capabilities@default:default,org.eclipse.emf.facet.common.core@default:default,org.eclipse.emf.facet.common.sdk.core@default:default,org.eclipse.emf.facet.common.sdk.ui@default:default,org.eclipse.emf.facet.common.ui@default:default,org.eclipse.emf.facet.custom.core.tests@default:default,org.eclipse.emf.facet.custom.core@default:default,org.eclipse.emf.facet.custom.doc@default:default,org.eclipse.emf.facet.custom.metamodel.edit@default:default,org.eclipse.emf.facet.custom.metamodel.editor@default:default,org.eclipse.emf.facet.custom.metamodel@default:default,org.eclipse.emf.facet.custom.sdk.core@default:default,org.eclipse.emf.facet.custom.sdk.tests@default:default,org.eclipse.emf.facet.custom.sdk.ui@default:default,org.eclipse.emf.facet.custom.tests.metamodel@default:default,org.eclipse.emf.facet.custom.tests@default:default,org.eclipse.emf.facet.custom.ui@default:default,org.eclipse.emf.facet.dev.core@default:default,org.eclipse.emf.facet.dev.ui@default:default,org.eclipse.emf.facet.doc.api.report@default:default,org.eclipse.emf.facet.doc.metric.report@default:default,org.eclipse.emf.facet.doc.test.report@default:default,org.eclipse.emf.facet.doc@default:default,org.eclipse.emf.facet.ecore.ui@default:default,org.eclipse.emf.facet.ecore@default:default,org.eclipse.emf.facet.efacet.core@default:default,org.eclipse.emf.facet.efacet.doc@default:default,org.eclipse.emf.facet.efacet.edit.core@default:default,org.eclipse.emf.facet.efacet.edit.ui@default:default,org.eclipse.emf.facet.efacet.examples.library.core@default:default,org.eclipse.emf.facet.efacet.examples.library.metamodel.edit@default:default,org.eclipse.emf.facet.efacet.examples.library.metamodel@default:default,org.eclipse.emf.facet.efacet.metamodel.edit@default:default,org.eclipse.emf.facet.efacet.metamodel.editor@default:default,org.eclipse.emf.facet.efacet.metamodel@default:default,org.eclipse.emf.facet.efacet.sdk.ui@default:default,org.eclipse.emf.facet.efacet.tests.metamodel@default:default,org.eclipse.emf.facet.efacet.tests@default:default,org.eclipse.emf.facet.efacet.ui@default:default,org.eclipse.emf.facet.query.java.core@default:default,org.eclipse.emf.facet.query.java.metamodel@default:default,org.eclipse.emf.facet.query.java.sdk.ui@default:default,org.eclipse.emf.facet.query.java.tests@default:default,org.eclipse.emf.facet.query.java.ui.tests@default:default,org.eclipse.emf.facet.query.java.ui@default:default,org.eclipse.emf.facet.query.ocl.core@default:default,org.eclipse.emf.facet.query.ocl.metamodel@default:default,org.eclipse.emf.facet.query.ocl.sdk.ui@default:default,org.eclipse.emf.facet.tests@default:default,org.eclipse.emf.facet.util.core.tests@default:default,org.eclipse.emf.facet.util.core@default:default,org.eclipse.emf.facet.util.efacet.ocl.core@default:default,org.eclipse.emf.facet.util.emf.catalog.metamodel@default:default,org.eclipse.emf.facet.util.emf.catalog@default:default,org.eclipse.emf.facet.util.emf.core.tests@default:default,org.eclipse.emf.facet.util.emf.core@default:default,org.eclipse.emf.facet.util.emf.doc@default:default,org.eclipse.emf.facet.util.emf.ui.tests@default:default,org.eclipse.emf.facet.util.emf.ui@default:default,org.eclipse.emf.facet.util.jface.ui@default:default,org.eclipse.emf.facet.util.junit.core@default:default,org.eclipse.emf.facet.util.pde.core@default:default,org.eclipse.emf.facet.util.swt@default:default,org.eclipse.emf.facet.util.tests.swtbot@default:default,org.eclipse.emf.facet.util.ui@default:default,org.eclipse.emf.facet.widgets.celleditors.ecore.tests.samplemm@default:default,org.eclipse.emf.facet.widgets.celleditors.ecore@default:default,org.eclipse.emf.facet.widgets.celleditors.edit@default:default,org.eclipse.emf.facet.widgets.celleditors.editor@default:default,org.eclipse.emf.facet.widgets.celleditors@default:default,org.eclipse.emf.facet.widgets.table.doc@default:default,org.eclipse.emf.facet.widgets.table.examples.library.core@default:default,org.eclipse.emf.facet.widgets.table.metamodel.edit@default:default,org.eclipse.emf.facet.widgets.table.metamodel@default:default,org.eclipse.emf.facet.widgets.table.tests@default:default,org.eclipse.emf.facet.widgets.table.ui.nattable@default:default,org.eclipse.emf.facet.widgets.table.ui.workbench@default:default,org.eclipse.emf.facet.widgets.table.ui@default:default,org.eclipse.emf.facet.widgets@default:default,org.eclipse.emf.importer.ecore@default:default,org.eclipse.emf.importer.java@default:default,org.eclipse.emf.importer.rose@default:default,org.eclipse.emf.importer@default:default,org.eclipse.emf.mapping.ecore.editor@default:default,org.eclipse.emf.mapping.ecore2ecore.editor@default:default,org.eclipse.emf.mapping.ecore2ecore@default:default,org.eclipse.emf.mapping.ecore2xml.ui@default:default,org.eclipse.emf.mapping.ecore2xml@default:default,org.eclipse.emf.mapping.ecore@default:default,org.eclipse.emf.mapping.ui@default:default,org.eclipse.emf.mapping@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.emf.mwe2.language.ui@default:default,org.eclipse.emf.mwe2.language@default:default,org.eclipse.emf.mwe2.launch.ui@default:default,org.eclipse.emf.mwe2.launch@default:default,org.eclipse.emf.mwe2.lib@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.emf.query.doc@default:default,org.eclipse.emf.query.examples@default:default,org.eclipse.emf.query.ocl@default:default,org.eclipse.emf.query@default:default,org.eclipse.emf.transaction.doc@default:default,org.eclipse.emf.transaction.examples@default:default,org.eclipse.emf.transaction.ui@default:default,org.eclipse.emf.transaction@default:default,org.eclipse.emf.validation.doc@default:default,org.eclipse.emf.validation.examples@default:default,org.eclipse.emf.validation.ocl@default:default,org.eclipse.emf.validation.ui.ide@default:default,org.eclipse.emf.validation.ui@default:default,org.eclipse.emf.validation@default:default,org.eclipse.emf.workspace.doc@default:default,org.eclipse.emf.workspace.ui@default:default,org.eclipse.emf.workspace@default:default,org.eclipse.emf@default:default,org.eclipse.epp.logging.aeri.core@default:default,org.eclipse.epp.logging.aeri.ide@default:default,org.eclipse.epp.mpc.core@default:default,org.eclipse.epp.mpc.help.ui@default:default,org.eclipse.epp.mpc.ui@default:default,org.eclipse.epp.package.committers@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.equinox.launcher.cocoa.macosx.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.equinox.p2.discovery.compatibility@default:default,org.eclipse.equinox.p2.discovery@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,org.eclipse.equinox.p2.ui.discovery@default:default,org.eclipse.equinox.p2.ui.importexport@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.macosx@default:false,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.gef.doc.isv@default:default,org.eclipse.gef.examples.ui.pde@default:default,org.eclipse.gef@default:default,org.eclipse.gmf.bridge.trace@default:default,org.eclipse.gmf.bridge.ui.dashboard@default:default,org.eclipse.gmf.bridge.ui@default:default,org.eclipse.gmf.bridge@default:default,org.eclipse.gmf.codegen.edit@default:default,org.eclipse.gmf.codegen.ui@default:default,org.eclipse.gmf.codegen.xtend.ui@default:default,org.eclipse.gmf.codegen.xtend@default:default,org.eclipse.gmf.codegen@default:default,org.eclipse.gmf.common@default:default,org.eclipse.gmf.doc.ui@default:default,org.eclipse.gmf.doc@default:default,org.eclipse.gmf.ecore.editor@default:default,org.eclipse.gmf.examples.runtime.diagram.geoshapes@default:default,org.eclipse.gmf.examples.runtime.diagram.logic.model.edit@default:default,org.eclipse.gmf.examples.runtime.diagram.logic.model.editor@default:default,org.eclipse.gmf.examples.runtime.diagram.logic.model@default:default,org.eclipse.gmf.examples.runtime.diagram.logic@default:default,org.eclipse.gmf.examples.runtime.ui.pde@default:default,org.eclipse.gmf.examples.runtime@default:default,org.eclipse.gmf.graphdef.codegen.ui@default:default,org.eclipse.gmf.graphdef.codegen@default:default,org.eclipse.gmf.graphdef.edit@default:default,org.eclipse.gmf.graphdef@default:default,org.eclipse.gmf.map.edit@default:default,org.eclipse.gmf.map@default:default,org.eclipse.gmf.runtime.common.core@default:default,org.eclipse.gmf.runtime.common.ui.action.ide@default:default,org.eclipse.gmf.runtime.common.ui.action@default:default,org.eclipse.gmf.runtime.common.ui.printing.win32@default:false,org.eclipse.gmf.runtime.common.ui.printing@default:default,org.eclipse.gmf.runtime.common.ui.services.action@default:default,org.eclipse.gmf.runtime.common.ui.services.dnd.ide@default:default,org.eclipse.gmf.runtime.common.ui.services.dnd@default:default,org.eclipse.gmf.runtime.common.ui.services.properties@default:default,org.eclipse.gmf.runtime.common.ui.services@default:default,org.eclipse.gmf.runtime.common.ui@default:default,org.eclipse.gmf.runtime.diagram.core@default:default,org.eclipse.gmf.runtime.diagram.ui.actions@default:default,org.eclipse.gmf.runtime.diagram.ui.dnd@default:default,org.eclipse.gmf.runtime.diagram.ui.geoshapes@default:default,org.eclipse.gmf.runtime.diagram.ui.printing.render@default:default,org.eclipse.gmf.runtime.diagram.ui.printing@default:default,org.eclipse.gmf.runtime.diagram.ui.properties@default:default,org.eclipse.gmf.runtime.diagram.ui.providers.ide@default:default,org.eclipse.gmf.runtime.diagram.ui.providers@default:default,org.eclipse.gmf.runtime.diagram.ui.render@default:default,org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide@default:default,org.eclipse.gmf.runtime.diagram.ui.resources.editor@default:default,org.eclipse.gmf.runtime.diagram.ui@default:default,org.eclipse.gmf.runtime.draw2d.ui.render.awt@default:default,org.eclipse.gmf.runtime.draw2d.ui.render@default:default,org.eclipse.gmf.runtime.draw2d.ui@default:default,org.eclipse.gmf.runtime.emf.clipboard.core@default:default,org.eclipse.gmf.runtime.emf.commands.core@default:default,org.eclipse.gmf.runtime.emf.core@default:default,org.eclipse.gmf.runtime.emf.type.core@default:default,org.eclipse.gmf.runtime.emf.type.ui@default:default,org.eclipse.gmf.runtime.emf.ui.properties@default:default,org.eclipse.gmf.runtime.emf.ui@default:default,org.eclipse.gmf.runtime.gef.ui@default:default,org.eclipse.gmf.runtime.lite.svg@default:default,org.eclipse.gmf.runtime.notation.edit@default:default,org.eclipse.gmf.runtime.notation.providers@default:default,org.eclipse.gmf.runtime.notation.sdk@default:default,org.eclipse.gmf.runtime.notation@default:default,org.eclipse.gmf.runtime.sdk@default:default,org.eclipse.gmf.sdk@default:default,org.eclipse.gmf.tooldef.edit@default:default,org.eclipse.gmf.tooldef@default:default,org.eclipse.gmf.tooling.runtime@default:default,org.eclipse.gmf.tooling@default:default,org.eclipse.gmf.validate@default:default,org.eclipse.gmf.xpand.editor@default:default,org.eclipse.gmf.xpand.qvtlibrary@default:default,org.eclipse.gmf.xpand@default:default,org.eclipse.gmf@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help.webapp@default:default,org.eclipse.help@default:default,org.eclipse.jdt.annotation*1.1.100.v20160418-1457@default:default,org.eclipse.jdt.annotation*2.1.0.v20160418-1457@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.doc.isv@default:default,org.eclipse.jdt.doc.user@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching.macosx@default:default,org.eclipse.jdt.launching.ui.macosx@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt@default:default,org.eclipse.jem.util@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.jgit.archive@default:default,org.eclipse.jgit.http.apache@default:default,org.eclipse.jgit@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.m2e.archetype.common@default:default,org.eclipse.m2e.core.ui@default:default,org.eclipse.m2e.core@default:default,org.eclipse.m2e.discovery@default:default,org.eclipse.m2e.editor.xml@default:default,org.eclipse.m2e.editor@default:default,org.eclipse.m2e.importer@default:default,org.eclipse.m2e.jdt.ui@default:false,org.eclipse.m2e.jdt@default:default,org.eclipse.m2e.launching@default:default,org.eclipse.m2e.lifecyclemapping.defaults@default:default,org.eclipse.m2e.maven.indexer@default:default,org.eclipse.m2e.maven.runtime.slf4j.simple@default:default,org.eclipse.m2e.maven.runtime@default:default,org.eclipse.m2e.model.edit@default:default,org.eclipse.m2e.profiles.core@default:default,org.eclipse.m2e.profiles.ui@default:default,org.eclipse.m2e.refactoring@default:default,org.eclipse.m2e.scm@default:default,org.eclipse.m2e.workspace.cli@default:default,org.eclipse.m2m.qvt.oml.common.ui@default:default,org.eclipse.m2m.qvt.oml.common@default:default,org.eclipse.m2m.qvt.oml.cst.parser@default:default,org.eclipse.m2m.qvt.oml.debug.core@default:default,org.eclipse.m2m.qvt.oml.debug.ui@default:default,org.eclipse.m2m.qvt.oml.doc@default:default,org.eclipse.m2m.qvt.oml.ecore.imperativeocl@default:default,org.eclipse.m2m.qvt.oml.editor.ui@default:default,org.eclipse.m2m.qvt.oml.emf.util.ui@default:default,org.eclipse.m2m.qvt.oml.emf.util@default:default,org.eclipse.m2m.qvt.oml.ocl@default:default,org.eclipse.m2m.qvt.oml.project@default:default,org.eclipse.m2m.qvt.oml.runtime.jdt@default:default,org.eclipse.m2m.qvt.oml.runtime.ui@default:default,org.eclipse.m2m.qvt.oml.runtime@default:default,org.eclipse.m2m.qvt.oml.samples@default:default,org.eclipse.m2m.qvt.oml.trace.edit@default:default,org.eclipse.m2m.qvt.oml.ui@default:default,org.eclipse.m2m.qvt.oml@default:default,org.eclipse.mylyn.bugzilla.core@default:default,org.eclipse.mylyn.bugzilla.ui@default:default,org.eclipse.mylyn.builds.core@default:default,org.eclipse.mylyn.builds.ui@default:default,org.eclipse.mylyn.commons.core@default:default,org.eclipse.mylyn.commons.identity.core@default:default,org.eclipse.mylyn.commons.net@default:default,org.eclipse.mylyn.commons.notifications.core@default:default,org.eclipse.mylyn.commons.notifications.feed@default:default,org.eclipse.mylyn.commons.notifications.ui@default:default,org.eclipse.mylyn.commons.repositories.core@default:default,org.eclipse.mylyn.commons.repositories.http.core@default:default,org.eclipse.mylyn.commons.repositories.ui@default:default,org.eclipse.mylyn.commons.screenshots@default:default,org.eclipse.mylyn.commons.ui@default:default,org.eclipse.mylyn.commons.workbench@default:default,org.eclipse.mylyn.commons.xmlrpc@default:default,org.eclipse.mylyn.context.core@default:default,org.eclipse.mylyn.context.tasks.ui@default:default,org.eclipse.mylyn.context.ui@default:default,org.eclipse.mylyn.debug.ui@default:default,org.eclipse.mylyn.discovery.core@default:default,org.eclipse.mylyn.discovery.ui@default:default,org.eclipse.mylyn.gerrit.core@default:default,org.eclipse.mylyn.gerrit.dashboard.core@default:default,org.eclipse.mylyn.gerrit.dashboard.ui@default:default,org.eclipse.mylyn.gerrit.ui@default:default,org.eclipse.mylyn.git.core@default:default,org.eclipse.mylyn.git.ui@default:default,org.eclipse.mylyn.hudson.core@default:default,org.eclipse.mylyn.hudson.ui@default:default,org.eclipse.mylyn.ide.ant@default:default,org.eclipse.mylyn.ide.ui@default:default,org.eclipse.mylyn.java.tasks@default:default,org.eclipse.mylyn.java.ui@default:default,org.eclipse.mylyn.monitor.core@default:default,org.eclipse.mylyn.monitor.ui@default:default,org.eclipse.mylyn.resources.ui@default:default,org.eclipse.mylyn.reviews.core@default:default,org.eclipse.mylyn.reviews.edit@default:default,org.eclipse.mylyn.reviews.ui@default:default,org.eclipse.mylyn.tasks.core@default:default,org.eclipse.mylyn.tasks.index.core@default:default,org.eclipse.mylyn.tasks.index.ui@default:default,org.eclipse.mylyn.tasks.search@default:default,org.eclipse.mylyn.tasks.ui@default:default,org.eclipse.mylyn.team.ui@default:default,org.eclipse.mylyn.versions.core@default:default,org.eclipse.mylyn.versions.ui@default:default,org.eclipse.mylyn.wikitext.asciidoc.core@default:default,org.eclipse.mylyn.wikitext.asciidoc.ui@default:default,org.eclipse.mylyn.wikitext.confluence.core@default:default,org.eclipse.mylyn.wikitext.confluence.ui@default:default,org.eclipse.mylyn.wikitext.context.ui@default:default,org.eclipse.mylyn.wikitext.core.ant@default:default,org.eclipse.mylyn.wikitext.core.osgi@default:default,org.eclipse.mylyn.wikitext.core@default:default,org.eclipse.mylyn.wikitext.help.ui@default:default,org.eclipse.mylyn.wikitext.html.core@default:default,org.eclipse.mylyn.wikitext.markdown.core@default:default,org.eclipse.mylyn.wikitext.markdown.ui@default:default,org.eclipse.mylyn.wikitext.mediawiki.core.ant@default:default,org.eclipse.mylyn.wikitext.mediawiki.core@default:default,org.eclipse.mylyn.wikitext.mediawiki.ui@default:default,org.eclipse.mylyn.wikitext.tasks.ui@default:default,org.eclipse.mylyn.wikitext.textile.core@default:default,org.eclipse.mylyn.wikitext.textile.ui@default:default,org.eclipse.mylyn.wikitext.tracwiki.core@default:default,org.eclipse.mylyn.wikitext.tracwiki.ui@default:default,org.eclipse.mylyn.wikitext.twiki.core@default:default,org.eclipse.mylyn.wikitext.twiki.ui@default:default,org.eclipse.mylyn.wikitext.ui@default:default,org.eclipse.nebula.widgets.nattable.core@default:default,org.eclipse.nebula.widgets.nattable.extension.glazedlists@default:default,org.eclipse.nebula.widgets.nattable.extension.nebula@default:default,org.eclipse.nebula.widgets.richtext@default:default,org.eclipse.nebula.widgets.tablecombo@default:default,org.eclipse.net4j.db.doc@default:default,org.eclipse.net4j.db.h2@default:default,org.eclipse.net4j.db.jdbc@default:default,org.eclipse.net4j.db@default:default,org.eclipse.net4j.debug@default:default,org.eclipse.net4j.defs@default:default,org.eclipse.net4j.doc@default:default,org.eclipse.net4j.examples.installer@default:default,org.eclipse.net4j.http.common@default:default,org.eclipse.net4j.http.server@default:default,org.eclipse.net4j.http@default:default,org.eclipse.net4j.jvm@default:default,org.eclipse.net4j.sdk@default:default,org.eclipse.net4j.tcp@default:default,org.eclipse.net4j.ui.defs@default:default,org.eclipse.net4j.ui.shared@default:default,org.eclipse.net4j.ui@default:default,org.eclipse.net4j.util.defs@default:default,org.eclipse.net4j.util.doc@default:default,org.eclipse.net4j.util.ui@default:default,org.eclipse.net4j.util@default:default,org.eclipse.net4j@default:default,org.eclipse.ocl.common.ui@default:default,org.eclipse.ocl.common@default:default,org.eclipse.ocl.doc@default:default,org.eclipse.ocl.ecore.edit@default:default,org.eclipse.ocl.ecore.tests@default:default,org.eclipse.ocl.ecore@default:default,org.eclipse.ocl.edit@default:default,org.eclipse.ocl.examples.classic@default:default,org.eclipse.ocl.examples.codegen@default:default,org.eclipse.ocl.examples.debug.ui@default:default,org.eclipse.ocl.examples.debug.vm.ui@default:default,org.eclipse.ocl.examples.debug.vm@default:default,org.eclipse.ocl.examples.debug@default:default,org.eclipse.ocl.examples.domain@default:default,org.eclipse.ocl.examples.emf.validation.validity.ui@default:default,org.eclipse.ocl.examples.emf.validation.validity@default:default,org.eclipse.ocl.examples.eventmanager.tests@default:default,org.eclipse.ocl.examples.eventmanager@default:default,org.eclipse.ocl.examples.impactanalyzer.testmodel.company@default:default,org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm@default:default,org.eclipse.ocl.examples.impactanalyzer.tests@default:default,org.eclipse.ocl.examples.impactanalyzer.testutils@default:default,org.eclipse.ocl.examples.impactanalyzer.ui@default:default,org.eclipse.ocl.examples.impactanalyzer.util@default:default,org.eclipse.ocl.examples.impactanalyzer@default:default,org.eclipse.ocl.examples.interpreter@default:default,org.eclipse.ocl.examples.library@default:default,org.eclipse.ocl.examples.pivot@default:default,org.eclipse.ocl.examples.standalone@default:default,org.eclipse.ocl.examples.tests@default:default,org.eclipse.ocl.examples.testutils@default:default,org.eclipse.ocl.examples.ui@default:default,org.eclipse.ocl.examples.uml25@default:default,org.eclipse.ocl.examples.unified@default:default,org.eclipse.ocl.examples.validity.test@default:default,org.eclipse.ocl.examples.validity@default:default,org.eclipse.ocl.examples.xtext.base.ui@default:default,org.eclipse.ocl.examples.xtext.base@default:default,org.eclipse.ocl.examples.xtext.completeocl.ui@default:default,org.eclipse.ocl.examples.xtext.completeocl@default:default,org.eclipse.ocl.examples.xtext.console@default:default,org.eclipse.ocl.examples.xtext.essentialocl.ui@default:default,org.eclipse.ocl.examples.xtext.essentialocl@default:default,org.eclipse.ocl.examples.xtext.markup.ui@default:default,org.eclipse.ocl.examples.xtext.markup@default:default,org.eclipse.ocl.examples.xtext.oclinecore.ui@default:default,org.eclipse.ocl.examples.xtext.oclinecore@default:default,org.eclipse.ocl.examples.xtext.oclstdlib.ui@default:default,org.eclipse.ocl.examples.xtext.oclstdlib@default:default,org.eclipse.ocl.examples.xtext.tests@default:default,org.eclipse.ocl.examples@default:default,org.eclipse.ocl.master@default:default,org.eclipse.ocl.pivot.ui@default:default,org.eclipse.ocl.pivot.uml@default:default,org.eclipse.ocl.pivot@default:default,org.eclipse.ocl.tests@default:default,org.eclipse.ocl.ui@default:default,org.eclipse.ocl.uml.edit@default:default,org.eclipse.ocl.uml.tests@default:default,org.eclipse.ocl.uml.ui@default:default,org.eclipse.ocl.uml@default:default,org.eclipse.ocl.xtext.base.ui@default:default,org.eclipse.ocl.xtext.base@default:default,org.eclipse.ocl.xtext.completeocl.ui@default:default,org.eclipse.ocl.xtext.completeocl@default:default,org.eclipse.ocl.xtext.essentialocl.ui@default:default,org.eclipse.ocl.xtext.essentialocl@default:default,org.eclipse.ocl.xtext.markup.ui@default:default,org.eclipse.ocl.xtext.markup@default:default,org.eclipse.ocl.xtext.oclinecore.ui@default:default,org.eclipse.ocl.xtext.oclinecore@default:default,org.eclipse.ocl.xtext.oclstdlib.ui@default:default,org.eclipse.ocl.xtext.oclstdlib@default:default,org.eclipse.ocl@default:default,org.eclipse.oomph.base.edit@default:default,org.eclipse.oomph.base@default:default,org.eclipse.oomph.extractor.lib@default:default,org.eclipse.oomph.jreinfo.ui@default:default,org.eclipse.oomph.jreinfo@default:default,org.eclipse.oomph.p2.core@default:default,org.eclipse.oomph.p2.doc@default:default,org.eclipse.oomph.p2.edit@default:default,org.eclipse.oomph.p2.ui@default:default,org.eclipse.oomph.p2@default:default,org.eclipse.oomph.predicates.edit@default:default,org.eclipse.oomph.predicates@default:default,org.eclipse.oomph.preferences.edit@default:default,org.eclipse.oomph.preferences.editor@default:default,org.eclipse.oomph.preferences@default:default,org.eclipse.oomph.projectconfig.edit@default:default,org.eclipse.oomph.projectconfig.editor@default:default,org.eclipse.oomph.projectconfig@default:default,org.eclipse.oomph.resources.edit@default:default,org.eclipse.oomph.resources@default:default,org.eclipse.oomph.setup.core@default:default,org.eclipse.oomph.setup.doc@default:default,org.eclipse.oomph.setup.edit@default:default,org.eclipse.oomph.setup.editor@default:default,org.eclipse.oomph.setup.git.edit@default:default,org.eclipse.oomph.setup.git@default:default,org.eclipse.oomph.setup.jdt.edit@default:default,org.eclipse.oomph.setup.jdt@default:default,org.eclipse.oomph.setup.launching.edit@default:default,org.eclipse.oomph.setup.launching@default:default,org.eclipse.oomph.setup.maven.edit@default:default,org.eclipse.oomph.setup.maven@default:default,org.eclipse.oomph.setup.mylyn.edit@default:default,org.eclipse.oomph.setup.mylyn@default:default,org.eclipse.oomph.setup.p2.edit@default:default,org.eclipse.oomph.setup.p2@default:default,org.eclipse.oomph.setup.pde.edit@default:default,org.eclipse.oomph.setup.pde@default:default,org.eclipse.oomph.setup.projects.edit@default:default,org.eclipse.oomph.setup.projects@default:default,org.eclipse.oomph.setup.projectset.edit@default:default,org.eclipse.oomph.setup.projectset@default:default,org.eclipse.oomph.setup.sdk@default:default,org.eclipse.oomph.setup.sync@default:default,org.eclipse.oomph.setup.targlets.edit@default:default,org.eclipse.oomph.setup.targlets@default:default,org.eclipse.oomph.setup.ui.ide@default:default,org.eclipse.oomph.setup.ui.questionnaire@default:default,org.eclipse.oomph.setup.ui@default:default,org.eclipse.oomph.setup.workbench.edit@default:default,org.eclipse.oomph.setup.workbench@default:default,org.eclipse.oomph.setup.workingsets.edit@default:default,org.eclipse.oomph.setup.workingsets@default:default,org.eclipse.oomph.setup@default:default,org.eclipse.oomph.targlets.core@default:default,org.eclipse.oomph.targlets.doc@default:default,org.eclipse.oomph.targlets.edit@default:default,org.eclipse.oomph.targlets.editor@default:default,org.eclipse.oomph.targlets.ui@default:default,org.eclipse.oomph.targlets@default:default,org.eclipse.oomph.ui@default:default,org.eclipse.oomph.util.pde@default:default,org.eclipse.oomph.util@default:default,org.eclipse.oomph.version.digest@default:default,org.eclipse.oomph.version.ui@default:default,org.eclipse.oomph.version@default:default,org.eclipse.oomph.workingsets.edit@default:default,org.eclipse.oomph.workingsets.editor@default:default,org.eclipse.oomph.workingsets@default:default,org.eclipse.orbit.mongodb@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.papyrus.cdo.ui.doc@default:default,org.eclipse.papyrus.copypaste.ui.doc@default:default,org.eclipse.papyrus.dsml.validation.doc@default:default,org.eclipse.papyrus.dsml.validation@default:default,org.eclipse.papyrus.infra.doc@default:default,org.eclipse.papyrus.infra.gmfdiag.common.doc@default:default,org.eclipse.papyrus.infra.gmfdiag.css.doc@default:default,org.eclipse.papyrus.infra.nattable.doc@default:default,org.eclipse.papyrus.infra.newchild.doc@default:default,org.eclipse.papyrus.infra.services.controlmode.doc@default:default,org.eclipse.papyrus.infra.types.doc@default:default,org.eclipse.papyrus.infra.viewpoints.doc@default:default,org.eclipse.papyrus.layers.documentation@default:default,org.eclipse.papyrus.m2m.qvto@default:default,org.eclipse.papyrus.migration.rsa@default:default,org.eclipse.papyrus.req.reqif.doc@default:default,org.eclipse.papyrus.sysml14.diagram.blockdefinition@default:default,org.eclipse.papyrus.sysml14.diagram.common@default:default,org.eclipse.papyrus.sysml14.diagram.internalblock@default:default,org.eclipse.papyrus.sysml14.diagram.parametric@default:default,org.eclipse.papyrus.sysml14.diagram.requirement@default:default,org.eclipse.papyrus.sysml14.edit@default:default,org.eclipse.papyrus.sysml14.nattable.allocation@default:default,org.eclipse.papyrus.sysml14.nattable.common@default:default,org.eclipse.papyrus.sysml14.nattable.requirement@default:default,org.eclipse.papyrus.sysml14.nattable.ui@default:default,org.eclipse.papyrus.sysml14.service.types@default:default,org.eclipse.papyrus.sysml14.ui@default:default,org.eclipse.papyrus.sysml14.validation@default:default,org.eclipse.papyrus.sysml14.viewpoint@default:default,org.eclipse.papyrus.sysml14@default:default,org.eclipse.papyrus.uml.decoratormodel.doc@default:default,org.eclipse.papyrus.uml.diagram.common.doc@default:default,org.eclipse.papyrus.uml.diagram.profile.doc@default:default,org.eclipse.papyrus.uml.doc@default:default,org.eclipse.papyrus.uml.modelrepair.doc@default:default,org.eclipse.papyrus.uml.oclconstraintevaluation@default:default,org.eclipse.papyrus.uml.profile.assistants.doc@default:default,org.eclipse.papyrus.uml.search.ui.doc@default:default,org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext@default:default,org.eclipse.papyrus.views.properties.doc@default:default,org.eclipse.papyrus.views.references.doc@default:default,org.eclipse.pde.api.tools.annotations@default:default,org.eclipse.pde.api.tools.ui@default:default,org.eclipse.pde.api.tools@default:default,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.pde.ds.annotations@default:default,org.eclipse.pde.ds.core@default:default,org.eclipse.pde.ds.ui@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.pde.launching@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.pde.ua.core@default:default,org.eclipse.pde.ua.ui@default:default,org.eclipse.pde.ui.templates@default:default,org.eclipse.pde.ui@default:default,org.eclipse.pde@default:default,org.eclipse.platform.doc.isv@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.platform@default:default,org.eclipse.rcp@default:default,org.eclipse.recommenders.apidocs.rcp@default:default,org.eclipse.recommenders.apidocs@default:default,org.eclipse.recommenders.calls.rcp@default:default,org.eclipse.recommenders.calls@default:default,org.eclipse.recommenders.chain.rcp@default:default,org.eclipse.recommenders.completion.rcp@default:default,org.eclipse.recommenders.constructors.rcp@default:default,org.eclipse.recommenders.constructors@default:default,org.eclipse.recommenders.coordinates.rcp@default:default,org.eclipse.recommenders.coordinates@default:default,org.eclipse.recommenders.injection@default:default,org.eclipse.recommenders.jayes.io@default:default,org.eclipse.recommenders.jayes@default:default,org.eclipse.recommenders.jdt@default:default,org.eclipse.recommenders.models.rcp@default:default,org.eclipse.recommenders.models@default:default,org.eclipse.recommenders.mylyn.rcp@default:default,org.eclipse.recommenders.net@default:default,org.eclipse.recommenders.news.api@default:default,org.eclipse.recommenders.news.impl@default:default,org.eclipse.recommenders.news.rcp@default:default,org.eclipse.recommenders.news@default:default,org.eclipse.recommenders.overrides.rcp@default:default,org.eclipse.recommenders.overrides@default:default,org.eclipse.recommenders.rcp@default:default,org.eclipse.recommenders.snipmatch.rcp@default:default,org.eclipse.recommenders.snipmatch@default:default,org.eclipse.recommenders.subwords.rcp@default:default,org.eclipse.recommenders.types.rcp@default:default,org.eclipse.recommenders.utils.rcp@default:default,org.eclipse.recommenders.utils@default:default,org.eclipse.search@default:default,org.eclipse.sirius.common.acceleo.aql.ide@default:default,org.eclipse.sirius.common.acceleo.aql@default:default,org.eclipse.sirius.common.acceleo.mtl.ide@default:default,org.eclipse.sirius.common.acceleo.mtl@default:default,org.eclipse.sirius.common.interpreter@default:default,org.eclipse.sirius.common.ocl@default:default,org.eclipse.sirius.common.ui.ext@default:default,org.eclipse.sirius.common.ui@default:default,org.eclipse.sirius.common.xtext@default:default,org.eclipse.sirius.common@default:default,org.eclipse.sirius.diagram.formatdata@default:default,org.eclipse.sirius.diagram.layoutdata@default:default,org.eclipse.sirius.diagram.sequence.edit@default:default,org.eclipse.sirius.diagram.sequence.ui@default:default,org.eclipse.sirius.diagram.sequence@default:default,org.eclipse.sirius.diagram.ui.ext@default:default,org.eclipse.sirius.diagram.ui@default:default,org.eclipse.sirius.diagram@default:default,org.eclipse.sirius.doc@default:default,org.eclipse.sirius.ecore.extender@default:default,org.eclipse.sirius.editor.diagram@default:default,org.eclipse.sirius.editor.properties.ext.widgets.reference@default:default,org.eclipse.sirius.editor.properties@default:default,org.eclipse.sirius.editor.sequence@default:default,org.eclipse.sirius.editor.table@default:default,org.eclipse.sirius.editor.tree@default:default,org.eclipse.sirius.editor@default:default,org.eclipse.sirius.eef.adapters@default:default,org.eclipse.sirius.ext.base@default:default,org.eclipse.sirius.ext.draw2d@default:default,org.eclipse.sirius.ext.e3.ui@default:default,org.eclipse.sirius.ext.e3@default:default,org.eclipse.sirius.ext.emf.edit@default:default,org.eclipse.sirius.ext.emf.tx@default:default,org.eclipse.sirius.ext.emf.ui@default:default,org.eclipse.sirius.ext.emf@default:default,org.eclipse.sirius.ext.gef@default:default,org.eclipse.sirius.ext.gmf.notation@default:default,org.eclipse.sirius.ext.gmf.runtime@default:default,org.eclipse.sirius.ext.jface@default:default,org.eclipse.sirius.ext.swt@default:default,org.eclipse.sirius.interpreter@default:default,org.eclipse.sirius.properties.edit@default:default,org.eclipse.sirius.properties.ext.widgets.reference.edit@default:default,org.eclipse.sirius.properties.ext.widgets.reference@default:default,org.eclipse.sirius.properties@default:default,org.eclipse.sirius.samples.family@default:default,org.eclipse.sirius.synchronizer@default:default,org.eclipse.sirius.table.ui.ext@default:default,org.eclipse.sirius.table.ui@default:default,org.eclipse.sirius.table@default:default,org.eclipse.sirius.tree.ui.ext@default:default,org.eclipse.sirius.tree.ui@default:default,org.eclipse.sirius.tree@default:default,org.eclipse.sirius.ui.ext@default:default,org.eclipse.sirius.ui.properties.ext.widgets.reference@default:default,org.eclipse.sirius.ui.properties@default:default,org.eclipse.sirius.ui@default:default,org.eclipse.sirius@default:default,org.eclipse.swt.cocoa.macosx.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.swtbot.eclipse.finder@default:default,org.eclipse.swtbot.junit4_x@default:default,org.eclipse.swtbot.swt.finder@default:default,org.eclipse.team.core@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.team.cvs.ssh2@default:default,org.eclipse.team.cvs.ui@default:default,org.eclipse.team.svn.core@default:default,org.eclipse.team.svn.help@default:default,org.eclipse.team.svn.ui.startup@default:default,org.eclipse.team.svn.ui@default:default,org.eclipse.team.svn@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.browser@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro.quicklinks@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.monitoring@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.net@default:default,org.eclipse.ui.themes@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.uml2.codegen.ecore@default:default,org.eclipse.uml2.common.edit@default:default,org.eclipse.uml2.common@default:default,org.eclipse.uml2.types@default:default,org.eclipse.uml2.uml.edit@default:default,org.eclipse.uml2.uml.editor@default:default,org.eclipse.uml2.uml.profile.standard@default:default,org.eclipse.uml2.uml.resources@default:default,org.eclipse.uml2.uml.validation@default:default,org.eclipse.uml2.uml@default:default,org.eclipse.update.configurator@3:true,org.eclipse.upr.depl.papyrus@default:default,org.eclipse.upr.depl@default:default,org.eclipse.upr.soaml.papyrus@default:default,org.eclipse.upr.soaml@default:default,org.eclipse.upr.utp.papyrus@default:default,org.eclipse.upr.utp@default:default,org.eclipse.userstorage.ui@default:default,org.eclipse.userstorage@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.wst.common.frameworks.ui@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.wst.common.ui@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.wst.sse.ui@default:default,org.eclipse.wst.validation.ui@default:default,org.eclipse.wst.validation@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.wst.xml.ui@default:default,org.eclipse.wst.xsd.core@default:default,org.eclipse.xpand@default:default,org.eclipse.xsd@default:default,org.eclipse.xtend.core@default:default,org.eclipse.xtend.doc@default:default,org.eclipse.xtend.examples@default:default,org.eclipse.xtend.ide.common@default:default,org.eclipse.xtend.ide@default:default,org.eclipse.xtend.lib.macro@default:default,org.eclipse.xtend.lib@default:default,org.eclipse.xtend.m2e@default:default,org.eclipse.xtend.standalone@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.xtend2.lib@default:default,org.eclipse.xtend@default:default,org.eclipse.xtext.activities@default:default,org.eclipse.xtext.builder.standalone@default:default,org.eclipse.xtext.builder@default:default,org.eclipse.xtext.common.types.edit@default:default,org.eclipse.xtext.common.types.shared.jdt38@default:false,org.eclipse.xtext.common.types.shared@default:default,org.eclipse.xtext.common.types.ui@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.xtext.doc@default:default,org.eclipse.xtext.ecore@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.xtext.ide@default:default,org.eclipse.xtext.idea.generator@default:default,org.eclipse.xtext.java@default:default,org.eclipse.xtext.junit4@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.xtext.m2e@default:default,org.eclipse.xtext.purexbase.ui@default:default,org.eclipse.xtext.purexbase@default:default,org.eclipse.xtext.smap@default:default,org.eclipse.xtext.ui.codetemplates.ui@default:default,org.eclipse.xtext.ui.codetemplates@default:default,org.eclipse.xtext.ui.ecore@default:default,org.eclipse.xtext.ui.shared@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.xtext.util@default:default,org.eclipse.xtext.xbase.ide@default:default,org.eclipse.xtext.xbase.junit@default:default,org.eclipse.xtext.xbase.lib@default:default,org.eclipse.xtext.xbase.ui@default:default,org.eclipse.xtext.xbase@default:default,org.eclipse.xtext.xtext.generator@default:default,org.eclipse.xtext.xtext.ui.examples@default:default,org.eclipse.xtext.xtext.ui.graph@default:default,org.eclipse.xtext.xtext.ui@default:default,org.eclipse.xtext.xtext.wizard@default:default,org.eclipse.xtext@default:default,org.eclipse.xwt@default:default,org.gradle.toolingapi@default:default,org.h2@default:default,org.hamcrest.core@default:default,org.hamcrest.integration@default:default,org.hamcrest.library@default:default,org.hamcrest.text@default:default,org.hamcrest@default:default,org.jsoup@default:default,org.junit@default:default,org.kohsuke.args4j@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,org.polarion.eclipse.team.svn.connector.javahl19@default:default,org.polarion.eclipse.team.svn.connector@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.slf4j.impl.log4j12@default:false,org.sonatype.m2e.mavenarchiver@default:default,org.sonatype.tycho.m2e@default:default,org.tukaani.xz@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.papyrus.bundles.tests@default:default,org.eclipse.papyrus.codegen@default:default,org.eclipse.papyrus.customization.nattableconfiguration@default:default,org.eclipse.papyrus.customization.palette@default:default,org.eclipse.papyrus.customization.paletteconfiguration@default:default,org.eclipse.papyrus.customization.properties.generation@default:default,org.eclipse.papyrus.customization.properties.model.xwt@default:default,org.eclipse.papyrus.customization.properties@default:default,org.eclipse.papyrus.customization@default:default,org.eclipse.papyrus.def@default:default,org.eclipse.papyrus.dev.assistants.codegen@default:default,org.eclipse.papyrus.dev.java.utils@default:default,org.eclipse.papyrus.dev.project.management@default:default,org.eclipse.papyrus.dev.tests.framework.ui@default:default,org.eclipse.papyrus.dev.tests.framework@default:default,org.eclipse.papyrus.dev.types@default:default,org.eclipse.papyrus.dev.view.services.edit.request@default:default,org.eclipse.papyrus.developer.profile@default:default,org.eclipse.papyrus.eclipse.project.editors.tests@default:default,org.eclipse.papyrus.eclipse.project.editors@default:default,org.eclipse.papyrus.editor.integration.tests@default:default,org.eclipse.papyrus.editor.perspectiveconfiguration@default:default,org.eclipse.papyrus.editor@default:default,org.eclipse.papyrus.emf.facet.aggregate.doc@default:default,org.eclipse.papyrus.emf.facet.common.core@default:default,org.eclipse.papyrus.emf.facet.common.sdk.core@default:default,org.eclipse.papyrus.emf.facet.common.ui@default:default,org.eclipse.papyrus.emf.facet.custom.core@default:default,org.eclipse.papyrus.emf.facet.custom.doc@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel.edit@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel.editor.doc@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel.editor@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel@default:default,org.eclipse.papyrus.emf.facet.custom.sdk.core@default:default,org.eclipse.papyrus.emf.facet.custom.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.custom.ui@default:default,org.eclipse.papyrus.emf.facet.doc@default:default,org.eclipse.papyrus.emf.facet.efacet.catalog@default:default,org.eclipse.papyrus.emf.facet.efacet.core@default:default,org.eclipse.papyrus.emf.facet.efacet.doc@default:default,org.eclipse.papyrus.emf.facet.efacet.edit@default:default,org.eclipse.papyrus.emf.facet.efacet.editor@default:default,org.eclipse.papyrus.emf.facet.efacet.metamodel.edit@default:default,org.eclipse.papyrus.emf.facet.efacet.metamodel@default:default,org.eclipse.papyrus.emf.facet.efacet.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.efacet.ui@default:default,org.eclipse.papyrus.emf.facet.efacet@default:default,org.eclipse.papyrus.emf.facet.query.java.core@default:default,org.eclipse.papyrus.emf.facet.query.java.metamodel@default:default,org.eclipse.papyrus.emf.facet.query.java.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.query.java@default:default,org.eclipse.papyrus.emf.facet.query.ocl.core@default:default,org.eclipse.papyrus.emf.facet.query.ocl.metamodel@default:default,org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.util.core@default:default,org.eclipse.papyrus.emf.facet.util.emf.catalog@default:default,org.eclipse.papyrus.emf.facet.util.emf.core@default:default,org.eclipse.papyrus.emf.facet.util.emf.doc@default:default,org.eclipse.papyrus.emf.facet.util.emf.ui@default:default,org.eclipse.papyrus.emf.facet.util.jface.ui@default:default,org.eclipse.papyrus.emf.facet.util.pde.core@default:default,org.eclipse.papyrus.emf.facet.util.swt@default:default,org.eclipse.papyrus.emf.facet.util.ui@default:default,org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore@default:default,org.eclipse.papyrus.emf.facet.widgets.celleditors@default:default,org.eclipse.papyrus.emf.facet.widgets@default:default,org.eclipse.papyrus.extensionpoints.editors@default:default,org.eclipse.papyrus.gmf.editpartview@default:default,org.eclipse.papyrus.gmf.editpoliciesstates@default:default,org.eclipse.papyrus.gmf.figureview@default:default,org.eclipse.papyrus.gmfgenextension@default:default,org.eclipse.papyrus.infra.core.architecture.edit@default:default,org.eclipse.papyrus.infra.architecture.representation.edit@default:default,org.eclipse.papyrus.infra.architecture.representation@default:default,org.eclipse.papyrus.infra.architecture@default:default,org.eclipse.papyrus.infra.core.architecture.ui@default:default,org.eclipse.papyrus.infra.core.architecture@default:default,org.eclipse.papyrus.infra.constraints.edit@default:default,org.eclipse.papyrus.infra.constraints.editor@default:default,org.eclipse.papyrus.infra.constraints.ui@default:default,org.eclipse.papyrus.infra.constraints@default:default,org.eclipse.papyrus.infra.core.clipboard.tests@default:default,org.eclipse.papyrus.infra.core.log@default:default,org.eclipse.papyrus.infra.core.pluginexplorer@default:default,org.eclipse.papyrus.infra.core.sasheditor.di.tests@default:default,org.eclipse.papyrus.infra.core.sasheditor.di@default:default,org.eclipse.papyrus.infra.core.sasheditor.tests@default:default,org.eclipse.papyrus.infra.core.sasheditor@default:default,org.eclipse.papyrus.infra.core.sashwindows.di@default:default,org.eclipse.papyrus.infra.core.tests@default:default,org.eclipse.papyrus.infra.core@default:default,org.eclipse.papyrus.infra.discovery.ui.menu@default:default,org.eclipse.papyrus.infra.discovery.ui@default:default,org.eclipse.papyrus.infra.discovery@default:default,org.eclipse.papyrus.infra.editor.welcome.internationalization@default:default,org.eclipse.papyrus.infra.editor.welcome.nattable@default:default,org.eclipse.papyrus.infra.editor.welcome.tests@default:default,org.eclipse.papyrus.infra.editor.welcome@default:default,org.eclipse.papyrus.infra.emf.appearance@default:default,org.eclipse.papyrus.infra.emf.commandstack@default:default,org.eclipse.papyrus.infra.emf.diagram.common@default:default,org.eclipse.papyrus.infra.emf.gmf.tests@default:default,org.eclipse.papyrus.infra.emf.gmf@default:default,org.eclipse.papyrus.infra.emf.nattable@default:default,org.eclipse.papyrus.infra.emf.readonly.tests@default:default,org.eclipse.papyrus.infra.emf.readonly@default:default,org.eclipse.papyrus.infra.emf.tests@default:default,org.eclipse.papyrus.infra.emf.types.ui.properties@default:default,org.eclipse.papyrus.infra.emf.types.ui@default:default,org.eclipse.papyrus.infra.emf.types@default:default,org.eclipse.papyrus.infra.emf@default:default,org.eclipse.papyrus.infra.filters.edit@default:default,org.eclipse.papyrus.infra.filters.tests@default:default,org.eclipse.papyrus.infra.filters@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant.edit@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant.editor@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant.ui@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant@default:default,org.eclipse.papyrus.infra.gmfdiag.canonical.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.canonical@default:default,org.eclipse.papyrus.infra.gmfdiag.commands.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.commands@default:default,org.eclipse.papyrus.infra.gmfdiag.common.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.common@default:default,org.eclipse.papyrus.infra.gmfdiag.controlmode@default:default,org.eclipse.papyrus.infra.gmfdiag.css.configuration@default:default,org.eclipse.papyrus.infra.gmfdiag.css.debug@default:default,org.eclipse.papyrus.infra.gmfdiag.css.model@default:default,org.eclipse.papyrus.infra.gmfdiag.css.properties@default:default,org.eclipse.papyrus.infra.gmfdiag.css.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.css.theme@default:default,org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui@default:default,org.eclipse.papyrus.infra.gmfdiag.css3.xtext@default:default,org.eclipse.papyrus.infra.gmfdiag.css@default:default,org.eclipse.papyrus.infra.gmfdiag.dnd@default:default,org.eclipse.papyrus.infra.gmfdiag.expansion.edit@default:default,org.eclipse.papyrus.infra.gmfdiag.expansion.editor@default:default,org.eclipse.papyrus.infra.gmfdiag.export@default:default,org.eclipse.papyrus.infra.gmfdiag.gef@default:default,org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter@default:default,org.eclipse.papyrus.infra.gmfdiag.hyperlink@default:default,org.eclipse.papyrus.infra.gmfdiag.menu.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.menu@default:default,org.eclipse.papyrus.infra.gmfdiag.modelexplorer@default:default,org.eclipse.papyrus.infra.gmfdiag.navigation@default:default,org.eclipse.papyrus.infra.gmfdiag.outline@default:default,org.eclipse.papyrus.infra.gmfdiag.preferences@default:default,org.eclipse.papyrus.infra.gmfdiag.properties@default:default,org.eclipse.papyrus.infra.gmfdiag.viewersearcher@default:default,org.eclipse.papyrus.infra.gmfdiag.welcome.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.welcome@default:default,org.eclipse.papyrus.infra.gmfdiag.widgets@default:default,org.eclipse.papyrus.infra.hyperlink@default:default,org.eclipse.papyrus.infra.internationalization.common@default:default,org.eclipse.papyrus.infra.internationalization.controlmode@default:default,org.eclipse.papyrus.infra.internationalization.edit@default:default,org.eclipse.papyrus.infra.internationalization.readonly@default:default,org.eclipse.papyrus.infra.internationalization.tests@default:default,org.eclipse.papyrus.infra.internationalization.ui@default:default,org.eclipse.papyrus.infra.internationalization.utils@default:default,org.eclipse.papyrus.infra.internationalization@default:default,org.eclipse.papyrus.infra.nattable.common.tests@default:default,org.eclipse.papyrus.infra.nattable.common@default:default,org.eclipse.papyrus.infra.nattable.controlmode@default:default,org.eclipse.papyrus.infra.nattable.gmfdiag@default:default,org.eclipse.papyrus.infra.nattable.model.edit@default:default,org.eclipse.papyrus.infra.nattable.model.editor.tests@default:default,org.eclipse.papyrus.infra.nattable.model.editor@default:default,org.eclipse.papyrus.infra.nattable.model.tests@default:default,org.eclipse.papyrus.infra.nattable.model@default:default,org.eclipse.papyrus.infra.nattable.modelexplorer@default:default,org.eclipse.papyrus.infra.nattable.properties@default:default,org.eclipse.papyrus.infra.nattable.tests@default:default,org.eclipse.papyrus.infra.nattable.views.config@default:default,org.eclipse.papyrus.infra.nattable.views.editor@default:default,org.eclipse.papyrus.infra.nattable.views.tests@default:default,org.eclipse.papyrus.infra.nattable@default:default,org.eclipse.papyrus.infra.newchild.edit@default:default,org.eclipse.papyrus.infra.newchild.editor@default:default,org.eclipse.papyrus.infra.newchild.tests@default:default,org.eclipse.papyrus.infra.newchild.ui@default:default,org.eclipse.papyrus.infra.newchild@default:default,org.eclipse.papyrus.infra.onefile.ui@default:default,org.eclipse.papyrus.infra.onefile@default:default,org.eclipse.papyrus.infra.properties.edit@default:default,org.eclipse.papyrus.infra.properties.editor@default:default,org.eclipse.papyrus.infra.properties.ui.tests@default:default,org.eclipse.papyrus.infra.properties.ui@default:default,org.eclipse.papyrus.infra.properties@default:default,org.eclipse.papyrus.infra.psf@default:default,org.eclipse.papyrus.infra.services.controlmode.history@default:default,org.eclipse.papyrus.infra.services.controlmode.tests@default:default,org.eclipse.papyrus.infra.services.controlmode@default:default,org.eclipse.papyrus.infra.services.decoration@default:default,org.eclipse.papyrus.infra.services.edit.tests@default:default,org.eclipse.papyrus.infra.services.edit.ui.tests@default:default,org.eclipse.papyrus.infra.services.edit.ui@default:default,org.eclipse.papyrus.infra.services.edit@default:default,org.eclipse.papyrus.infra.services.labelprovider.tests@default:default,org.eclipse.papyrus.infra.services.labelprovider@default:default,org.eclipse.papyrus.infra.services.localizer@default:default,org.eclipse.papyrus.infra.services.markerlistener@default:default,org.eclipse.papyrus.infra.services.navigation@default:default,org.eclipse.papyrus.infra.services.openelement@default:default,org.eclipse.papyrus.infra.services.resourceloading.tests@default:default,org.eclipse.papyrus.infra.services.resourceloading.ui@default:default,org.eclipse.papyrus.infra.services.resourceloading@default:default,org.eclipse.papyrus.infra.services.semantic.tests@default:default,org.eclipse.papyrus.infra.services.semantic@default:default,org.eclipse.papyrus.infra.services.validation@default:default,org.eclipse.papyrus.infra.services.viewersearch@default:default,org.eclipse.papyrus.infra.services.viewlabelprovider@default:default,org.eclipse.papyrus.infra.sync@default:default,org.eclipse.papyrus.infra.tools.tests@default:default,org.eclipse.papyrus.infra.tools@default:default,org.eclipse.papyrus.infra.types.core@default:default,org.eclipse.papyrus.infra.types.edit@default:default,org.eclipse.papyrus.infra.types.editor@default:default,org.eclipse.papyrus.infra.types.rulebased@default:default,org.eclipse.papyrus.infra.types.tests@default:default,org.eclipse.papyrus.infra.types.ui.tests@default:default,org.eclipse.papyrus.infra.types.ui@default:default,org.eclipse.papyrus.infra.types@default:default,org.eclipse.papyrus.infra.ui.emf.tests@default:default,org.eclipse.papyrus.infra.ui.emf@default:default,org.eclipse.papyrus.infra.ui.resources@default:default,org.eclipse.papyrus.infra.ui.tests@default:default,org.eclipse.papyrus.infra.ui@default:default,org.eclipse.papyrus.infra.viewpoints.configuration.tests@default:default,org.eclipse.papyrus.infra.viewpoints.policy.edit@default:default,org.eclipse.papyrus.infra.viewpoints.policy.tests@default:default,org.eclipse.papyrus.infra.viewpoints.policy@default:default,org.eclipse.papyrus.infra.widgets.toolbox@default:default,org.eclipse.papyrus.infra.widgets@default:default,org.eclipse.papyrus.junit.framework@default:default,org.eclipse.papyrus.junit.utils@default:default,org.eclipse.papyrus.mwe2.utils@default:default,org.eclipse.papyrus.releng.dev.release@default:default,org.eclipse.papyrus.releng.main.release@default:default,org.eclipse.papyrus.sdk@default:default,org.eclipse.papyrus.search.tests@default:default,org.eclipse.papyrus.sysml.architecture@default:default,org.eclipse.papyrus.sysml.diagram.blockdefinition.tests@default:default,org.eclipse.papyrus.sysml.diagram.blockdefinition@default:default,org.eclipse.papyrus.sysml.diagram.common@default:default,org.eclipse.papyrus.sysml.diagram.css@default:default,org.eclipse.papyrus.sysml.diagram.internalblock.tests@default:default,org.eclipse.papyrus.sysml.diagram.internalblock@default:default,org.eclipse.papyrus.sysml.diagram.parametric.tests@default:default,org.eclipse.papyrus.sysml.diagram.parametric@default:default,org.eclipse.papyrus.sysml.diagram.requirement.tests@default:default,org.eclipse.papyrus.sysml.diagram.requirement@default:default,org.eclipse.papyrus.sysml.diagram.ui@default:default,org.eclipse.papyrus.sysml.edit@default:default,org.eclipse.papyrus.sysml.modelexplorer.tests@default:default,org.eclipse.papyrus.sysml.modelexplorer@default:default,org.eclipse.papyrus.sysml.nattable.allocation.config@default:default,org.eclipse.papyrus.sysml.nattable.allocation.tests@default:default,org.eclipse.papyrus.sysml.nattable.allocation@default:default,org.eclipse.papyrus.sysml.nattable.menu@default:default,org.eclipse.papyrus.sysml.nattable.requirement.config@default:default,org.eclipse.papyrus.sysml.nattable.requirement.tests@default:default,org.eclipse.papyrus.sysml.nattable.requirement@default:default,org.eclipse.papyrus.sysml.nattable@default:default,org.eclipse.papyrus.sysml.properties@default:default,org.eclipse.papyrus.sysml.service.types.tests@default:default,org.eclipse.papyrus.sysml.service.types@default:default,org.eclipse.papyrus.sysml.tests@default:default,org.eclipse.papyrus.sysml@default:default,org.eclipse.papyrus.team.svn@default:default,org.eclipse.papyrus.tests.diagramassistants@default:default,org.eclipse.papyrus.tests.framework.annotations@default:default,org.eclipse.papyrus.tests.framework.edit@default:default,org.eclipse.papyrus.tests.framework.editor@default:default,org.eclipse.papyrus.tests.framework@default:default,org.eclipse.papyrus.tests@default:default,org.eclipse.papyrus.uml.alf.backend.tests@default:default,org.eclipse.papyrus.uml.alf.common.ui@default:default,org.eclipse.papyrus.uml.alf.common@default:default,org.eclipse.papyrus.uml.alf.libraries@default:default,org.eclipse.papyrus.uml.alf.tests@default:default,org.eclipse.papyrus.uml.alf.to.fuml@default:default,org.eclipse.papyrus.uml.alf.ui@default:default,org.eclipse.papyrus.uml.alf@default:default,org.eclipse.papyrus.uml.appearance@default:default,org.eclipse.papyrus.uml.architecture@default:default,org.eclipse.papyrus.uml.commands@default:default,org.eclipse.papyrus.uml.controlmode.profile@default:default,org.eclipse.papyrus.uml.decoratormodel.controlmode.tests@default:default,org.eclipse.papyrus.uml.decoratormodel.controlmode@default:default,org.eclipse.papyrus.uml.decoratormodel.properties@default:default,org.eclipse.papyrus.uml.decoratormodel.tests@default:default,org.eclipse.papyrus.uml.decoratormodel.ui@default:default,org.eclipse.papyrus.uml.decoratormodel@default:default,org.eclipse.papyrus.uml.developer.mde@default:default,org.eclipse.papyrus.uml.diagram.activity.tests@default:default,org.eclipse.papyrus.uml.diagram.activity@default:default,org.eclipse.papyrus.uml.diagram.clazz.tests@default:default,org.eclipse.papyrus.uml.diagram.clazz@default:default,org.eclipse.papyrus.uml.diagram.common.groups@default:default,org.eclipse.papyrus.uml.diagram.common.palette.customaction@default:default,org.eclipse.papyrus.uml.diagram.common.tests@default:default,org.eclipse.papyrus.uml.diagram.common@default:default,org.eclipse.papyrus.uml.diagram.communication.tests@default:default,org.eclipse.papyrus.uml.diagram.communication@default:default,org.eclipse.papyrus.uml.diagram.component.tests@default:default,org.eclipse.papyrus.uml.diagram.component@default:default,org.eclipse.papyrus.uml.diagram.composite.tests@default:default,org.eclipse.papyrus.uml.diagram.composite@default:default,org.eclipse.papyrus.uml.diagram.css.palette@default:default,org.eclipse.papyrus.uml.diagram.css@default:default,org.eclipse.papyrus.uml.diagram.deployment.tests@default:default,org.eclipse.papyrus.uml.diagram.deployment@default:default,org.eclipse.papyrus.uml.diagram.dnd.tests@default:default,org.eclipse.papyrus.uml.diagram.dnd@default:default,org.eclipse.papyrus.uml.diagram.icons@default:default,org.eclipse.papyrus.uml.diagram.interactionoverview.tests@default:default,org.eclipse.papyrus.uml.diagram.interactionoverview@default:default,org.eclipse.papyrus.uml.diagram.linklf@default:default,org.eclipse.papyrus.uml.diagram.menu@default:default,org.eclipse.papyrus.uml.diagram.modelexplorer@default:default,org.eclipse.papyrus.uml.diagram.navigation@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration.editor@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration@default:default,org.eclipse.papyrus.uml.diagram.profile.tests@default:default,org.eclipse.papyrus.uml.diagram.profile@default:default,org.eclipse.papyrus.uml.diagram.sequence.tests@default:default,org.eclipse.papyrus.uml.diagram.sequence@default:default,org.eclipse.papyrus.uml.diagram.statemachine.tests@default:default,org.eclipse.papyrus.uml.diagram.statemachine@default:default,org.eclipse.papyrus.uml.diagram.stereotype.edition@default:default,org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests@default:default,org.eclipse.papyrus.uml.diagram.symbols.properties@default:default,org.eclipse.papyrus.uml.diagram.symbols@default:default,org.eclipse.papyrus.uml.diagram.tests@default:default,org.eclipse.papyrus.uml.diagram.timing.tests@default:default,org.eclipse.papyrus.uml.diagram.timing@default:default,org.eclipse.papyrus.uml.diagram.usecase.tests@default:default,org.eclipse.papyrus.uml.diagram.usecase@default:default,org.eclipse.papyrus.uml.diagram.wizards.tests@default:default,org.eclipse.papyrus.uml.diagram.wizards@default:default,org.eclipse.papyrus.uml.documentation.profile@default:default,org.eclipse.papyrus.uml.dynamic.profile.tests@default:default,org.eclipse.papyrus.uml.extensionpoints@default:default,org.eclipse.papyrus.uml.filters.edit@default:default,org.eclipse.papyrus.uml.filters.tests@default:default,org.eclipse.papyrus.uml.filters@default:default,org.eclipse.papyrus.uml.icons@default:default,org.eclipse.papyrus.uml.import@default:default,org.eclipse.papyrus.uml.internationalization.controlmode.tests@default:default,org.eclipse.papyrus.uml.internationalization.edit@default:default,org.eclipse.papyrus.uml.internationalization.tests@default:default,org.eclipse.papyrus.uml.internationalization.utils@default:default,org.eclipse.papyrus.uml.internationalization@default:default,org.eclipse.papyrus.uml.modelexplorer.tests@default:default,org.eclipse.papyrus.uml.modelexplorer.widgets@default:default,org.eclipse.papyrus.uml.modelexplorer@default:default,org.eclipse.papyrus.uml.modelrepair.tests@default:default,org.eclipse.papyrus.uml.modelrepair@default:default,org.eclipse.papyrus.uml.nattable.clazz.config.tests@default:default,org.eclipse.papyrus.uml.nattable.clazz.config@default:default,org.eclipse.papyrus.uml.nattable.generic.config@default:default,org.eclipse.papyrus.uml.nattable.generic.tests@default:default,org.eclipse.papyrus.uml.nattable.generic@default:default,org.eclipse.papyrus.uml.nattable.menu@default:default,org.eclipse.papyrus.uml.nattable.richtext@default:default,org.eclipse.papyrus.uml.nattable.stereotype.display.tests@default:default,org.eclipse.papyrus.uml.nattable.stereotype.display@default:default,org.eclipse.papyrus.uml.nattable.tests@default:default,org.eclipse.papyrus.uml.nattable.xtext.integration@default:default,org.eclipse.papyrus.uml.nattable.xtext.valuespecification@default:default,org.eclipse.papyrus.uml.nattable@default:default,org.eclipse.papyrus.uml.navigation@default:default,org.eclipse.papyrus.uml.perspective@default:default,org.eclipse.papyrus.uml.profile.assistants.generator.tests@default:default,org.eclipse.papyrus.uml.profile.assistants.generator.ui@default:default,org.eclipse.papyrus.uml.profile.assistants.generator@default:default,org.eclipse.papyrus.uml.profile.drafter.documentation@default:default,org.eclipse.papyrus.uml.profile.drafter.tests@default:default,org.eclipse.papyrus.uml.profile.drafter@default:default,org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui@default:default,org.eclipse.papyrus.uml.profile.newchildmenu.generator@default:default,org.eclipse.papyrus.uml.profile.tests@default:default,org.eclipse.papyrus.uml.profile.types.generator.tests@default:default,org.eclipse.papyrus.uml.profile.types.generator.ui@default:default,org.eclipse.papyrus.uml.profile.types.generator@default:default,org.eclipse.papyrus.uml.profile@default:default,org.eclipse.papyrus.uml.properties.xtext@default:default,org.eclipse.papyrus.uml.properties@default:default,org.eclipse.papyrus.uml.resourceloading.profile@default:default,org.eclipse.papyrus.uml.search.ui@default:default,org.eclipse.papyrus.uml.service.types.tests@default:default,org.eclipse.papyrus.uml.service.types.ui.tests@default:default,org.eclipse.papyrus.uml.service.types.ui@default:default,org.eclipse.papyrus.uml.service.types@default:default,org.eclipse.papyrus.uml.service.validation@default:default,org.eclipse.papyrus.uml.services.decoration@default:default,org.eclipse.papyrus.uml.templaterepository@default:default,org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.collaborationuse.xtext@default:default,org.eclipse.papyrus.uml.textedit.common.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.common.xtext@default:default,org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext@default:default,org.eclipse.papyrus.uml.textedit.javaconstraint@default:default,org.eclipse.papyrus.uml.textedit.message.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.message.xtext@default:default,org.eclipse.papyrus.uml.textedit.parameter.tests@default:default,org.eclipse.papyrus.uml.textedit.parameter.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.parameter.xtext@default:default,org.eclipse.papyrus.uml.textedit.port.tests@default:default,org.eclipse.papyrus.uml.textedit.port.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.port.xtext@default:default,org.eclipse.papyrus.uml.textedit.property.tests@default:default,org.eclipse.papyrus.uml.textedit.property.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.property.xtext@default:default,org.eclipse.papyrus.uml.textedit.state.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.state.xtext@default:default,org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext@default:default,org.eclipse.papyrus.uml.textedit.tests@default:default,org.eclipse.papyrus.uml.textedit.transition.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.transition.xtext@default:default,org.eclipse.papyrus.uml.textedit.valuespecification.tests@default:default,org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils@default:default,org.eclipse.papyrus.uml.textedit.valuespecification.xtext@default:default,org.eclipse.papyrus.uml.tools.tests@default:default,org.eclipse.papyrus.uml.tools.utils.tests@default:default,org.eclipse.papyrus.uml.tools.utils@default:default,org.eclipse.papyrus.uml.tools@default:default,org.eclipse.papyrus.uml.types.core@default:default,org.eclipse.papyrus.uml.types.ui.properties@default:default,org.eclipse.papyrus.uml.ui@default:default,org.eclipse.papyrus.uml.validation.tests.genvalidation@default:default,org.eclipse.papyrus.uml.validation.tests.staticprofile@default:default,org.eclipse.papyrus.uml.validation.tests@default:default,org.eclipse.papyrus.uml.xtext.integration.core@default:default,org.eclipse.papyrus.uml.xtext.integration.ui@default:default,org.eclipse.papyrus.uml.xtext.integration.validation@default:default,org.eclipse.papyrus.views.documentation@default:default,org.eclipse.papyrus.views.modelexplorer.newchild@default:default,org.eclipse.papyrus.views.modelexplorer.resourceloading@default:default,org.eclipse.papyrus.views.modelexplorer.tests@default:default,org.eclipse.papyrus.views.modelexplorer.widgets@default:default,org.eclipse.papyrus.views.modelexplorer@default:default,org.eclipse.papyrus.views.properties@default:default,org.eclipse.papyrus.views.references@default:default,org.eclipse.papyrus.views.search@default:default,org.eclipse.papyrus.views.validation@default:default"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/utils/TestPrepareUtils.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/utils/TestPrepareUtils.java
index 09cccf1cd39..5d05dbf30b7 100644
--- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/utils/TestPrepareUtils.java
+++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition.tests/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/tests/utils/TestPrepareUtils.java
@@ -1,201 +1,211 @@
-/*****************************************************************************

- * Copyright (c) 2011-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.sysml.diagram.blockdefinition.tests.utils;

-

-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramCommandStack;

-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getEditPart;

-import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getTransactionalEditingDomain;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.edit.command.SetCommand;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.RequestConstants;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.CreateCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;

-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.gmfdiag.common.helper.DiagramHelper;

-import org.eclipse.papyrus.infra.services.edit.commands.ConfigureFeatureCommandFactory;

-import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.utils.GMFCommandUtils;

-import org.eclipse.papyrus.sysml.diagram.blockdefinition.Activator;

-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;

-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;

-import org.eclipse.uml2.uml.UMLPackage;

-import org.junit.Assert;

-

-

-public class TestPrepareUtils {

-

-	public static void changeVisibility(View view) throws Exception {

-		SetCommand changeVisibilityCommand = new SetCommand(getTransactionalEditingDomain(), view, NotationPackage.eINSTANCE.getView_Visible(), !view.isVisible());

-		//getCommandStack().execute(new EMFtoGEFCommandWrapper(changeVisibilityCommand));

-		getTransactionalEditingDomain().getCommandStack().execute(changeVisibilityCommand);

-

-		//Workaround for CSS refresh issue (Bug 416737: [CSS] Setters of the CSS runtime notation API don't take into consideration CSS values)

-		DiagramHelper.refresh(EditorUtils.getDiagramEditPart(), true);

-	}

-

-	public static EObject createElement(IElementType elementType, View containerView) throws Exception {

-		return createElement(elementType, containerView.getElement());

-	}

-

-	@SuppressWarnings("unchecked")

-	public static EObject createElement(IElementType elementType, EObject container) throws Exception {

-		CreateElementRequest createElementRequest = new CreateElementRequest(getTransactionalEditingDomain(), container, elementType);

-

-		if(elementType == SysMLElementTypes.PART_PROPERTY) {

-			// Create type

-			CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), container.eContainer(), SysMLElementTypes.BLOCK);

-			ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(container.eContainer()).getEditCommand(createTypeRequest);

-			getDiagramCommandStack().execute(new ICommandProxy(createTypeCommand));

-

-			createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));

-

-		} else if(elementType == SysMLElementTypes.REFERENCE_PROPERTY) {

-			// Create type

-			CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), container.eContainer(), SysMLElementTypes.BLOCK);

-			ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(container.eContainer()).getEditCommand(createTypeRequest);

-			getDiagramCommandStack().execute(new ICommandProxy(createTypeCommand));

-

-			createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));

-

-		} else if(elementType == SysMLElementTypes.VALUE_PROPERTY) {

-			// Create type

-			CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), container.eContainer(), UMLElementTypes.DATA_TYPE);

-			ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(container.eContainer()).getEditCommand(createTypeRequest);

-			getDiagramCommandStack().execute(new ICommandProxy(createTypeCommand));

-

-			createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));

-

-		}

-

-		ICommand createElementCommand = ElementEditServiceUtils.getCommandProvider(container).getEditCommand(createElementRequest);

-		getDiagramCommandStack().execute(new ICommandProxy(createElementCommand));

-

-		return GMFCommandUtils.getCommandEObjectResult(createElementCommand);

-	}

-

-	public static EObject createLink(IElementType elementType, EObject source, EObject target) throws Exception {

-		CreateRelationshipRequest createRelationshipRequest = new CreateRelationshipRequest(getTransactionalEditingDomain(), source, target, elementType);

-

-		ICommand createRelationshipCommand = ElementEditServiceUtils.getCommandProvider(elementType).getEditCommand(createRelationshipRequest);

-		getDiagramCommandStack().execute(new ICommandProxy(createRelationshipCommand));

-

-		return GMFCommandUtils.getCommandEObjectResult(createRelationshipCommand);

-	}

-

-	public static View createGraphicalNode(IElementType elementType, String graphicalType, View containerView) throws Exception {

-

-		EObject newObject = createElement(elementType, containerView);

-

-		// Add view

-		ViewDescriptor viewDescriptor = new ViewDescriptor(new SemanticAdapter(newObject, null), Node.class, graphicalType, ViewUtil.APPEND, true, Activator.DIAGRAM_PREFERENCES_HINT);

-		CreateCommand createViewCommand = new CreateCommand(getTransactionalEditingDomain(), viewDescriptor, containerView);

-		getDiagramCommandStack().execute(new ICommandProxy(createViewCommand));

-

-		EReference[] erefs = new EReference[]{ NotationPackage.eINSTANCE.getView_Element() };

-		@SuppressWarnings("unchecked")

-		Collection<View> views = EMFCoreUtil.getReferencers(newObject, erefs);

-

-		return (View)views.toArray()[0];

-	}

-

-	public static View createGraphicalLink(IElementType elementType, String graphicalType, View containerView, EditPart sourceEP, EditPart targetEP) throws Exception {

-		CreateConnectionViewRequest request = createConnectionRequest(elementType, sourceEP, targetEP);

-

-		Command command = targetEP.getCommand(request);

-		Assert.assertNotNull("Command to create graphical link should not be null", command);

-		Assert.assertTrue("Command should be executable", command.canExecute());

-

-		getDiagramCommandStack().execute(command);

-

-		IAdaptable viewAdapter = (IAdaptable)request.getNewObject();

-		View newView = (View)viewAdapter.getAdapter(View.class);

-		Assert.assertNotNull("View should not be null", newView);

-

-		EReference[] erefs = new EReference[]{ NotationPackage.eINSTANCE.getView_Element() };

-		@SuppressWarnings("unchecked")

-		Collection<View> views = EMFCoreUtil.getReferencers(newView, erefs);

-

-		return (View)views.toArray()[0];

-

-	}

-

-	public static CreateConnectionViewRequest createConnectionRequest(IElementType type, EditPart source, EditPart target) {

-		CreateConnectionViewRequest connectionRequest = CreateViewRequestFactory.getCreateConnectionRequest(type, Activator.DIAGRAM_PREFERENCES_HINT);

-

-		connectionRequest.setSourceEditPart(null);

-		connectionRequest.setTargetEditPart(source);

-		connectionRequest.setType(RequestConstants.REQ_CONNECTION_START);

-		source.getCommand(connectionRequest);

-

-		// Now, setup the request in preparation to get the

-		// connection end

-		// command.

-		connectionRequest.setSourceEditPart(source);

-		connectionRequest.setTargetEditPart(target);

-		connectionRequest.setType(RequestConstants.REQ_CONNECTION_END);

-		return connectionRequest;

-	}

-

-

-	public static View dropFromModelExplorer(IElementType elementType, View containerView) throws Exception {

-		EObject newObject = createElement(elementType, containerView);

-		return dropFromModelExplorer(newObject, containerView);

-	}

-

-	public static View dropFromModelExplorer(EObject eObject, View containerView) throws Exception {

-

-		// Find container EditPart (for command creation)

-		EditPart containerEditPart = getEditPart(containerView);

-

-		// Prepare drop request

-		DropObjectsRequest dropRequest = new DropObjectsRequest();

-		ArrayList<EObject> list = new ArrayList<EObject>();

-		list.add(eObject);

-		dropRequest.setObjects(list);

-		dropRequest.setLocation(new Point(20, 20));

-

-		// Get drop command

-		Command command = containerEditPart.getCommand(dropRequest);

-		getDiagramCommandStack().execute(command);

-

-		EReference[] erefs = new EReference[]{ NotationPackage.eINSTANCE.getView_Element() };

-		@SuppressWarnings("unchecked")

-		Collection<View> views = EMFCoreUtil.getReferencers(eObject, erefs);

-

-		return (View)views.toArray()[0];

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2011-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.sysml.diagram.blockdefinition.tests.utils;
+
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getDiagramCommandStack;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getEditPart;
+import static org.eclipse.papyrus.sysml.diagram.blockdefinition.tests.utils.EditorUtils.getTransactionalEditingDomain;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.RequestConstants;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
+import org.eclipse.gmf.runtime.diagram.ui.commands.CreateCommand;
+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
+import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
+import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
+import org.eclipse.gmf.runtime.notation.Node;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.gmfdiag.common.helper.DiagramHelper;
+import org.eclipse.papyrus.infra.services.edit.commands.ConfigureFeatureCommandFactory;
+import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
+import org.eclipse.papyrus.infra.services.edit.context.TypeContext;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.utils.GMFCommandUtils;
+import org.eclipse.papyrus.sysml.diagram.blockdefinition.Activator;
+import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;
+import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
+import org.eclipse.uml2.uml.UMLPackage;
+import org.junit.Assert;
+
+
+public class TestPrepareUtils {
+
+	public static void changeVisibility(View view) throws Exception {
+		SetCommand changeVisibilityCommand = new SetCommand(getTransactionalEditingDomain(), view, NotationPackage.eINSTANCE.getView_Visible(), !view.isVisible());
+		//getCommandStack().execute(new EMFtoGEFCommandWrapper(changeVisibilityCommand));
+		getTransactionalEditingDomain().getCommandStack().execute(changeVisibilityCommand);
+
+		//Workaround for CSS refresh issue (Bug 416737: [CSS] Setters of the CSS runtime notation API don't take into consideration CSS values)
+		DiagramHelper.refresh(EditorUtils.getDiagramEditPart(), true);
+	}
+
+	public static EObject createElement(IElementType elementType, View containerView) throws Exception {
+		return createElement(elementType, containerView.getElement());
+	}
+
+	@SuppressWarnings("unchecked")
+	public static EObject createElement(IElementType elementType, EObject container) throws Exception {
+		CreateElementRequest createElementRequest = new CreateElementRequest(getTransactionalEditingDomain(), container, elementType);
+
+		if(elementType == SysMLElementTypes.PART_PROPERTY) {
+			// Create type
+			CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), container.eContainer(), SysMLElementTypes.BLOCK);
+			ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(container.eContainer()).getEditCommand(createTypeRequest);
+			getDiagramCommandStack().execute(new ICommandProxy(createTypeCommand));
+
+			createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));
+
+		} else if(elementType == SysMLElementTypes.REFERENCE_PROPERTY) {
+			// Create type
+			CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), container.eContainer(), SysMLElementTypes.BLOCK);
+			ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(container.eContainer()).getEditCommand(createTypeRequest);
+			getDiagramCommandStack().execute(new ICommandProxy(createTypeCommand));
+
+			createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));
+
+		} else if(elementType == SysMLElementTypes.VALUE_PROPERTY) {
+			// Create type
+			CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), container.eContainer(), UMLElementTypes.DATA_TYPE);
+			ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(container.eContainer()).getEditCommand(createTypeRequest);
+			getDiagramCommandStack().execute(new ICommandProxy(createTypeCommand));
+
+			createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));
+
+		}
+
+		ICommand createElementCommand = ElementEditServiceUtils.getCommandProvider(container).getEditCommand(createElementRequest);
+		getDiagramCommandStack().execute(new ICommandProxy(createElementCommand));
+
+		return GMFCommandUtils.getCommandEObjectResult(createElementCommand);
+	}
+
+	public static EObject createLink(IElementType elementType, EObject source, EObject target) throws Exception {
+		CreateRelationshipRequest createRelationshipRequest = new CreateRelationshipRequest(getTransactionalEditingDomain(), source, target, elementType);
+
+		IClientContext context;
+		try {
+			context = TypeContext.getContext(getTransactionalEditingDomain());
+		} catch (ServiceException e) {
+			return null;
+		}
+
+		ICommand createRelationshipCommand = ElementEditServiceUtils.getCommandProvider(elementType, context).getEditCommand(createRelationshipRequest);
+		getDiagramCommandStack().execute(new ICommandProxy(createRelationshipCommand));
+
+		return GMFCommandUtils.getCommandEObjectResult(createRelationshipCommand);
+	}
+
+	public static View createGraphicalNode(IElementType elementType, String graphicalType, View containerView) throws Exception {
+
+		EObject newObject = createElement(elementType, containerView);
+
+		// Add view
+		ViewDescriptor viewDescriptor = new ViewDescriptor(new SemanticAdapter(newObject, null), Node.class, graphicalType, ViewUtil.APPEND, true, Activator.DIAGRAM_PREFERENCES_HINT);
+		CreateCommand createViewCommand = new CreateCommand(getTransactionalEditingDomain(), viewDescriptor, containerView);
+		getDiagramCommandStack().execute(new ICommandProxy(createViewCommand));
+
+		EReference[] erefs = new EReference[]{ NotationPackage.eINSTANCE.getView_Element() };
+		@SuppressWarnings("unchecked")
+		Collection<View> views = EMFCoreUtil.getReferencers(newObject, erefs);
+
+		return (View)views.toArray()[0];
+	}
+
+	public static View createGraphicalLink(IElementType elementType, String graphicalType, View containerView, EditPart sourceEP, EditPart targetEP) throws Exception {
+		CreateConnectionViewRequest request = createConnectionRequest(elementType, sourceEP, targetEP);
+
+		Command command = targetEP.getCommand(request);
+		Assert.assertNotNull("Command to create graphical link should not be null", command);
+		Assert.assertTrue("Command should be executable", command.canExecute());
+
+		getDiagramCommandStack().execute(command);
+
+		IAdaptable viewAdapter = (IAdaptable)request.getNewObject();
+		View newView = (View)viewAdapter.getAdapter(View.class);
+		Assert.assertNotNull("View should not be null", newView);
+
+		EReference[] erefs = new EReference[]{ NotationPackage.eINSTANCE.getView_Element() };
+		@SuppressWarnings("unchecked")
+		Collection<View> views = EMFCoreUtil.getReferencers(newView, erefs);
+
+		return (View)views.toArray()[0];
+
+	}
+
+	public static CreateConnectionViewRequest createConnectionRequest(IElementType type, EditPart source, EditPart target) {
+		CreateConnectionViewRequest connectionRequest = CreateViewRequestFactory.getCreateConnectionRequest(type, Activator.DIAGRAM_PREFERENCES_HINT);
+
+		connectionRequest.setSourceEditPart(null);
+		connectionRequest.setTargetEditPart(source);
+		connectionRequest.setType(RequestConstants.REQ_CONNECTION_START);
+		source.getCommand(connectionRequest);
+
+		// Now, setup the request in preparation to get the
+		// connection end
+		// command.
+		connectionRequest.setSourceEditPart(source);
+		connectionRequest.setTargetEditPart(target);
+		connectionRequest.setType(RequestConstants.REQ_CONNECTION_END);
+		return connectionRequest;
+	}
+
+
+	public static View dropFromModelExplorer(IElementType elementType, View containerView) throws Exception {
+		EObject newObject = createElement(elementType, containerView);
+		return dropFromModelExplorer(newObject, containerView);
+	}
+
+	public static View dropFromModelExplorer(EObject eObject, View containerView) throws Exception {
+
+		// Find container EditPart (for command creation)
+		EditPart containerEditPart = getEditPart(containerView);
+
+		// Prepare drop request
+		DropObjectsRequest dropRequest = new DropObjectsRequest();
+		ArrayList<EObject> list = new ArrayList<EObject>();
+		list.add(eObject);
+		dropRequest.setObjects(list);
+		dropRequest.setLocation(new Point(20, 20));
+
+		// Get drop command
+		Command command = containerEditPart.getCommand(dropRequest);
+		getDiagramCommandStack().execute(command);
+
+		EReference[] erefs = new EReference[]{ NotationPackage.eINSTANCE.getView_Element() };
+		@SuppressWarnings("unchecked")
+		Collection<View> views = EMFCoreUtil.getReferencers(eObject, erefs);
+
+		return (View)views.toArray()[0];
+	}
+}
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/model/ModelWithIBD.di b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/model/ModelWithIBD.di
index 30eafffc3e5..523d7f0822c 100644
--- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/model/ModelWithIBD.di
+++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/model/ModelWithIBD.di
@@ -1,17 +1,25 @@
-<?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="ModelWithIBD.notation#_hbf7wGbVEeGgmux_Cozgdg"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="ModelWithIBD.notation#_hbf7wGbVEeGgmux_Cozgdg"/>

-        </children>

-      </children>

-    </windows>

-  </sashModel>

-</di:SashWindowsMngr>

+<?xml version="1.0" encoding="ASCII"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
+  <di:SashWindowsMngr>
+	  <pageList>
+	    <availablePage>
+	      <emfPageIdentifier href="ModelWithIBD.notation#_hbf7wGbVEeGgmux_Cozgdg"/>
+	    </availablePage>
+	  </pageList>
+	  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+	    <windows>
+	      <children xsi:type="di:TabFolder">
+	        <children>
+	          <emfPageIdentifier href="ModelWithIBD.notation#_hbf7wGbVEeGgmux_Cozgdg"/>
+	        </children>
+	      </children>
+	    </windows>
+	  </sashModel>
+  </di:SashWindowsMngr>
+  <architecture:ArchitectureDescription contextId="org.eclipse.papyrus.sysml.architecture.SysML"/>
+  <architecture:ArchitectureDescriptionPreferences>
+    <viewpointIds>org.eclipse.papyrus.sysml.analysis</viewpointIds>
+    <viewpointIds>org.eclipse.papyrus.sysml.design</viewpointIds>
+  </architecture:ArchitectureDescriptionPreferences>
+</xmi:XMI>
+  
\ No newline at end of file
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/utils/TestPrepareUtils.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/utils/TestPrepareUtils.java
index 7bc4d5b4449..72790b12254 100644
--- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/utils/TestPrepareUtils.java
+++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock.tests/src/org/eclipse/papyrus/sysml/diagram/internalblock/tests/utils/TestPrepareUtils.java
@@ -1,308 +1,318 @@
-/*****************************************************************************

- * 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

- *

- * Contributors:

- *		

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.diagram.internalblock.tests.utils;

-

-import static org.eclipse.papyrus.sysml.diagram.internalblock.tests.utils.EditorUtils.getEditPart;

-import static org.eclipse.papyrus.sysml.diagram.internalblock.tests.utils.EditorUtils.getTransactionalEditingDomain;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.edit.command.SetCommand;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.CreateCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.services.edit.commands.ConfigureFeatureCommandFactory;

-import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.utils.GMFCommandUtils;

-import org.eclipse.papyrus.sysml.blocks.Block;

-import org.eclipse.papyrus.sysml.diagram.internalblock.Activator;

-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;

-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;

-import org.eclipse.uml2.uml.ConnectableElement;

-import org.eclipse.uml2.uml.Connector;

-import org.eclipse.uml2.uml.ConnectorEnd;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.EncapsulatedClassifier;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.UMLPackage;

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

-import org.junit.Assert;

-

-

-public class TestPrepareUtils {

-

-	public static void changeVisibility(View view) throws Exception {

-		SetCommand changeVisibilityCommand = new SetCommand(getTransactionalEditingDomain(), view, NotationPackage.eINSTANCE.getView_Visible(), !view.isVisible());

-		getTransactionalEditingDomain().getCommandStack().execute(changeVisibilityCommand);

-	}

-

-	public static EObject createElement(IElementType elementType, View containerView) throws Exception {

-		return createElement(elementType, containerView.getElement());

-	}

-

-	@SuppressWarnings("unchecked")

-	public static EObject createElement(IElementType elementType, EObject container) throws Exception {

-		CreateElementRequest createElementRequest = new CreateElementRequest(getTransactionalEditingDomain(), container, elementType);

-

-		EObject typeOwner = EMFCoreUtil.getContainer(container, UMLPackage.eINSTANCE.getPackage());

-

-		if(elementType == SysMLElementTypes.ACTOR_PART_PROPERTY) {

-			// Create type

-			CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), typeOwner, UMLElementTypes.ACTOR);

-			ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(typeOwner).getEditCommand(createTypeRequest);

-			getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createTypeCommand));

-

-			// If container is a Property, substitute container by the Property type

-			if(container instanceof Property) {

-				container = ((Property)container).getType();

-				createElementRequest.setContainer(container);

-			}

-			createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));

-

-		} else if(elementType == SysMLElementTypes.PART_PROPERTY) {

-			// Create type

-			CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), typeOwner, SysMLElementTypes.BLOCK);

-			ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(typeOwner).getEditCommand(createTypeRequest);

-			getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createTypeCommand));

-

-			// If container is a Property, substitute container by the Property type

-			if(container instanceof Property) {

-				container = ((Property)container).getType();

-				createElementRequest.setContainer(container);

-			}

-			createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));

-

-		} else if(elementType == SysMLElementTypes.REFERENCE_PROPERTY) {

-			// Create type

-			CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), typeOwner, SysMLElementTypes.BLOCK);

-			ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(typeOwner).getEditCommand(createTypeRequest);

-			getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createTypeCommand));

-

-			// If container is a Property, substitute container by the Property type

-			if(container instanceof Property) {

-				container = ((Property)container).getType();

-				createElementRequest.setContainer(container);

-			}

-			createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));

-

-		} else if(elementType == SysMLElementTypes.VALUE_PROPERTY) {

-			// Create type

-			CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), typeOwner, UMLElementTypes.DATA_TYPE);

-			ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(typeOwner).getEditCommand(createTypeRequest);

-			getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createTypeCommand));

-

-			// If container is a Property, substitute container by the Property type

-			if(container instanceof Property) {

-				container = ((Property)container).getType();

-				createElementRequest.setContainer(container);

-			}

-			createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));

-

-		} else if(elementType == SysMLElementTypes.FLOW_PORT_NA) {

-			// Create type

-			CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), typeOwner, SysMLElementTypes.FLOW_SPECIFICATION);

-			ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(typeOwner).getEditCommand(createTypeRequest);

-			getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createTypeCommand));

-

-			// If container is a Property, substitute container by the Property type

-			if(container instanceof Property) {

-				container = ((Property)container).getType();

-				createElementRequest.setContainer(container);

-			}

-			createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));

-

-		} else if(elementType == UMLElementTypes.PROPERTY) {

-

-			// If container is a Property, substitute container by the Property type

-			if(container instanceof Property) {

-				container = ((Property)container).getType();

-				createElementRequest.setContainer(container);

-			}

-		}

-

-		ICommand createElementCommand = ElementEditServiceUtils.getCommandProvider(container).getEditCommand(createElementRequest);

-		getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createElementCommand));

-

-		return GMFCommandUtils.getCommandEObjectResult(createElementCommand);

-	}

-

-	public static void setBlockIsEncapsulated(final Element block, final boolean isEncapsulated) throws Exception {

-		AbstractTransactionalCommand setCommand = new AbstractTransactionalCommand(getTransactionalEditingDomain(), "Set Block isEncapsulated", null) {

-

-			@Override

-			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-				Block blockApp = UMLUtil.getStereotypeApplication(block, Block.class);

-				blockApp.setIsEncapsulated(isEncapsulated);

-				return CommandResult.newOKCommandResult(block);

-			}

-		};

-		getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(setCommand));

-	}

-

-	public static EObject createLink(IElementType elementType, EObject source, EObject target) throws Exception {

-		CreateRelationshipRequest createRelationshipRequest = new CreateRelationshipRequest(getTransactionalEditingDomain(), source, target, elementType);

-

-		ICommand createRelationshipCommand = ElementEditServiceUtils.getCommandProvider(elementType).getEditCommand(createRelationshipRequest);

-		getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createRelationshipCommand));

-

-		return GMFCommandUtils.getCommandEObjectResult(createRelationshipCommand);

-	}

-

-	public static EObject createConnectorLink(final EncapsulatedClassifier container, final ConnectableElement sourceRole, final Property sourcePartWithPort, final ConnectableElement targetRole, final Property targetPartWithPort) throws Exception {

-

-		AbstractTransactionalCommand createConnectorCommand = new AbstractTransactionalCommand(getTransactionalEditingDomain(), "Create connector", null) {

-

-			@Override

-			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-				Connector connector = container.createOwnedConnector("ConnectorTest");

-

-				ConnectorEnd connectorEndSrc = connector.createEnd();

-				connectorEndSrc.setRole(sourceRole);

-				connectorEndSrc.setPartWithPort(sourcePartWithPort);

-

-				ConnectorEnd connectorEndTgt = connector.createEnd();

-				connectorEndTgt.setRole(targetRole);

-				connectorEndTgt.setPartWithPort(targetPartWithPort);

-

-				return CommandResult.newOKCommandResult(connector);

-			}

-

-		};

-

-		getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createConnectorCommand));

-

-		return GMFCommandUtils.getCommandEObjectResult(createConnectorCommand);

-	}

-

-	public static View createGraphicalNode(IElementType elementType, String graphicalType, View containerView) throws Exception {

-		EObject newObject = createElement(elementType, containerView);

-

-		// Add view

-		ViewDescriptor viewDescriptor = new ViewDescriptor(new SemanticAdapter(newObject, null), Node.class, graphicalType, ViewUtil.APPEND, true, Activator.DIAGRAM_PREFERENCES_HINT);

-		CreateCommand createViewCommand = new CreateCommand(getTransactionalEditingDomain(), viewDescriptor, containerView);

-		Assert.assertTrue("Command should be executable", createViewCommand.canExecute());

-		EditorUtils.getDiagramCommandStack().execute(new ICommandProxy(createViewCommand));

-

-		EReference[] erefs = new EReference[]{ NotationPackage.eINSTANCE.getView_Element() };

-		@SuppressWarnings("unchecked")

-		Collection<View> views = EMFCoreUtil.getReferencers(newObject, erefs);

-

-		return (View)views.toArray()[0];

-	}

-

-	public static View createGraphicalNode(IElementType elementType, EObject semanticContainer, String graphicalType, View containerView) throws Exception {

-

-		EObject newObject = createElement(elementType, semanticContainer);

-

-		// Add view

-		ViewDescriptor viewDescriptor = new ViewDescriptor(new SemanticAdapter(newObject, null), Node.class, graphicalType, ViewUtil.APPEND, true, Activator.DIAGRAM_PREFERENCES_HINT);

-		CreateCommand createViewCommand = new CreateCommand(getTransactionalEditingDomain(), viewDescriptor, containerView);

-		EditorUtils.getDiagramCommandStack().execute(new ICommandProxy(createViewCommand));

-

-		EReference[] erefs = new EReference[]{ NotationPackage.eINSTANCE.getView_Element() };

-		@SuppressWarnings("unchecked")

-		Collection<View> views = EMFCoreUtil.getReferencers(newObject, erefs);

-

-		return (View)views.toArray()[0];

-	}

-

-	public static View createGraphicalLink(IElementType elementType, String graphicalType, View containerView, EditPart sourceEP, EditPart targetEP) throws Exception {

-		CreateConnectionViewRequest request = createConnectionRequest(elementType, sourceEP, targetEP);

-

-		Command command = targetEP.getCommand(request);

-		Assert.assertNotNull("Command to create graphical link should not be null", command);

-		Assert.assertTrue("Command should be executable", command.canExecute());

-

-		EditorUtils.getDiagramCommandStack().execute(command);

-

-		IAdaptable viewAdapter = (IAdaptable)request.getNewObject();

-		View newView = (View)viewAdapter.getAdapter(View.class);

-		Assert.assertNotNull("View should not be null", newView);

-

-		return newView;

-	}

-

-	public static CreateConnectionViewRequest createConnectionRequest(IElementType type, EditPart source, EditPart target) {

-		CreateConnectionViewRequest connectionRequest = CreateViewRequestFactory.getCreateConnectionRequest(type, Activator.DIAGRAM_PREFERENCES_HINT);

-

-		connectionRequest.setSourceEditPart(null);

-		connectionRequest.setTargetEditPart(source);

-		connectionRequest.setType(RequestConstants.REQ_CONNECTION_START);

-		source.getCommand(connectionRequest);

-

-		// Now, setup the request in preparation to get the

-		// connection end

-		// command.

-		connectionRequest.setSourceEditPart(source);

-		connectionRequest.setTargetEditPart(target);

-		connectionRequest.setType(RequestConstants.REQ_CONNECTION_END);

-		return connectionRequest;

-	}

-

-

-	public static View dropFromModelExplorer(IElementType elementType, View containerView) throws Exception {

-		EObject newObject = createElement(elementType, containerView);

-		return dropFromModelExplorer(newObject, containerView);

-	}

-

-	public static View dropFromModelExplorer(EObject eObject, View containerView) throws Exception {

-

-		// Find container EditPart (for command creation)

-		EditPart containerEditPart = getEditPart(containerView);

-

-		// Prepare drop request

-		DropObjectsRequest dropRequest = new DropObjectsRequest();

-		ArrayList<EObject> list = new ArrayList<EObject>();

-		list.add(eObject);

-		dropRequest.setObjects(list);

-		dropRequest.setLocation(new Point(20, 20));

-

-		// Get drop command

-		Command command = containerEditPart.getCommand(dropRequest);

-		EditorUtils.getDiagramCommandStack().execute(command);

-

-		EReference[] erefs = new EReference[]{ NotationPackage.eINSTANCE.getView_Element() };

-		@SuppressWarnings("unchecked")

-		Collection<View> views = EMFCoreUtil.getReferencers(eObject, erefs);

-

-		return (View)views.toArray()[0];

-	}

-}

+/*****************************************************************************
+ * 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
+ *
+ * Contributors:
+ *		
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.sysml.diagram.internalblock.tests.utils;
+
+import static org.eclipse.papyrus.sysml.diagram.internalblock.tests.utils.EditorUtils.getEditPart;
+import static org.eclipse.papyrus.sysml.diagram.internalblock.tests.utils.EditorUtils.getTransactionalEditingDomain;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
+import org.eclipse.gmf.runtime.diagram.ui.commands.CreateCommand;
+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
+import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
+import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
+import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
+import org.eclipse.gmf.runtime.notation.Node;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.services.edit.commands.ConfigureFeatureCommandFactory;
+import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
+import org.eclipse.papyrus.infra.services.edit.context.TypeContext;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.utils.GMFCommandUtils;
+import org.eclipse.papyrus.sysml.blocks.Block;
+import org.eclipse.papyrus.sysml.diagram.internalblock.Activator;
+import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;
+import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
+import org.eclipse.uml2.uml.ConnectableElement;
+import org.eclipse.uml2.uml.Connector;
+import org.eclipse.uml2.uml.ConnectorEnd;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.EncapsulatedClassifier;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.UMLPackage;
+import org.eclipse.uml2.uml.util.UMLUtil;
+import org.junit.Assert;
+
+
+public class TestPrepareUtils {
+
+	public static void changeVisibility(View view) throws Exception {
+		SetCommand changeVisibilityCommand = new SetCommand(getTransactionalEditingDomain(), view, NotationPackage.eINSTANCE.getView_Visible(), !view.isVisible());
+		getTransactionalEditingDomain().getCommandStack().execute(changeVisibilityCommand);
+	}
+
+	public static EObject createElement(IElementType elementType, View containerView) throws Exception {
+		return createElement(elementType, containerView.getElement());
+	}
+
+	@SuppressWarnings("unchecked")
+	public static EObject createElement(IElementType elementType, EObject container) throws Exception {
+		CreateElementRequest createElementRequest = new CreateElementRequest(getTransactionalEditingDomain(), container, elementType);
+
+		EObject typeOwner = EMFCoreUtil.getContainer(container, UMLPackage.eINSTANCE.getPackage());
+
+		if(elementType == SysMLElementTypes.ACTOR_PART_PROPERTY) {
+			// Create type
+			CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), typeOwner, UMLElementTypes.ACTOR);
+			ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(typeOwner).getEditCommand(createTypeRequest);
+			getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createTypeCommand));
+
+			// If container is a Property, substitute container by the Property type
+			if(container instanceof Property) {
+				container = ((Property)container).getType();
+				createElementRequest.setContainer(container);
+			}
+			createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));
+
+		} else if(elementType == SysMLElementTypes.PART_PROPERTY) {
+			// Create type
+			CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), typeOwner, SysMLElementTypes.BLOCK);
+			ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(typeOwner).getEditCommand(createTypeRequest);
+			getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createTypeCommand));
+
+			// If container is a Property, substitute container by the Property type
+			if(container instanceof Property) {
+				container = ((Property)container).getType();
+				createElementRequest.setContainer(container);
+			}
+			createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));
+
+		} else if(elementType == SysMLElementTypes.REFERENCE_PROPERTY) {
+			// Create type
+			CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), typeOwner, SysMLElementTypes.BLOCK);
+			ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(typeOwner).getEditCommand(createTypeRequest);
+			getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createTypeCommand));
+
+			// If container is a Property, substitute container by the Property type
+			if(container instanceof Property) {
+				container = ((Property)container).getType();
+				createElementRequest.setContainer(container);
+			}
+			createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));
+
+		} else if(elementType == SysMLElementTypes.VALUE_PROPERTY) {
+			// Create type
+			CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), typeOwner, UMLElementTypes.DATA_TYPE);
+			ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(typeOwner).getEditCommand(createTypeRequest);
+			getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createTypeCommand));
+
+			// If container is a Property, substitute container by the Property type
+			if(container instanceof Property) {
+				container = ((Property)container).getType();
+				createElementRequest.setContainer(container);
+			}
+			createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));
+
+		} else if(elementType == SysMLElementTypes.FLOW_PORT_NA) {
+			// Create type
+			CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), typeOwner, SysMLElementTypes.FLOW_SPECIFICATION);
+			ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(typeOwner).getEditCommand(createTypeRequest);
+			getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createTypeCommand));
+
+			// If container is a Property, substitute container by the Property type
+			if(container instanceof Property) {
+				container = ((Property)container).getType();
+				createElementRequest.setContainer(container);
+			}
+			createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));
+
+		} else if(elementType == UMLElementTypes.PROPERTY) {
+
+			// If container is a Property, substitute container by the Property type
+			if(container instanceof Property) {
+				container = ((Property)container).getType();
+				createElementRequest.setContainer(container);
+			}
+		}
+
+		ICommand createElementCommand = ElementEditServiceUtils.getCommandProvider(container).getEditCommand(createElementRequest);
+		getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createElementCommand));
+
+		return GMFCommandUtils.getCommandEObjectResult(createElementCommand);
+	}
+
+	public static void setBlockIsEncapsulated(final Element block, final boolean isEncapsulated) throws Exception {
+		AbstractTransactionalCommand setCommand = new AbstractTransactionalCommand(getTransactionalEditingDomain(), "Set Block isEncapsulated", null) {
+
+			@Override
+			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+				Block blockApp = UMLUtil.getStereotypeApplication(block, Block.class);
+				blockApp.setIsEncapsulated(isEncapsulated);
+				return CommandResult.newOKCommandResult(block);
+			}
+		};
+		getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(setCommand));
+	}
+
+	public static EObject createLink(IElementType elementType, EObject source, EObject target) throws Exception {
+		CreateRelationshipRequest createRelationshipRequest = new CreateRelationshipRequest(getTransactionalEditingDomain(), source, target, elementType);
+
+		IClientContext context;
+		try {
+			context = TypeContext.getContext(getTransactionalEditingDomain());
+		} catch (ServiceException e) {
+			return null;
+		}
+
+		ICommand createRelationshipCommand = ElementEditServiceUtils.getCommandProvider(elementType, context).getEditCommand(createRelationshipRequest);
+		getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createRelationshipCommand));
+
+		return GMFCommandUtils.getCommandEObjectResult(createRelationshipCommand);
+	}
+
+	public static EObject createConnectorLink(final EncapsulatedClassifier container, final ConnectableElement sourceRole, final Property sourcePartWithPort, final ConnectableElement targetRole, final Property targetPartWithPort) throws Exception {
+
+		AbstractTransactionalCommand createConnectorCommand = new AbstractTransactionalCommand(getTransactionalEditingDomain(), "Create connector", null) {
+
+			@Override
+			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+				Connector connector = container.createOwnedConnector("ConnectorTest");
+
+				ConnectorEnd connectorEndSrc = connector.createEnd();
+				connectorEndSrc.setRole(sourceRole);
+				connectorEndSrc.setPartWithPort(sourcePartWithPort);
+
+				ConnectorEnd connectorEndTgt = connector.createEnd();
+				connectorEndTgt.setRole(targetRole);
+				connectorEndTgt.setPartWithPort(targetPartWithPort);
+
+				return CommandResult.newOKCommandResult(connector);
+			}
+
+		};
+
+		getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createConnectorCommand));
+
+		return GMFCommandUtils.getCommandEObjectResult(createConnectorCommand);
+	}
+
+	public static View createGraphicalNode(IElementType elementType, String graphicalType, View containerView) throws Exception {
+		EObject newObject = createElement(elementType, containerView);
+
+		// Add view
+		ViewDescriptor viewDescriptor = new ViewDescriptor(new SemanticAdapter(newObject, null), Node.class, graphicalType, ViewUtil.APPEND, true, Activator.DIAGRAM_PREFERENCES_HINT);
+		CreateCommand createViewCommand = new CreateCommand(getTransactionalEditingDomain(), viewDescriptor, containerView);
+		Assert.assertTrue("Command should be executable", createViewCommand.canExecute());
+		EditorUtils.getDiagramCommandStack().execute(new ICommandProxy(createViewCommand));
+
+		EReference[] erefs = new EReference[]{ NotationPackage.eINSTANCE.getView_Element() };
+		@SuppressWarnings("unchecked")
+		Collection<View> views = EMFCoreUtil.getReferencers(newObject, erefs);
+
+		return (View)views.toArray()[0];
+	}
+
+	public static View createGraphicalNode(IElementType elementType, EObject semanticContainer, String graphicalType, View containerView) throws Exception {
+
+		EObject newObject = createElement(elementType, semanticContainer);
+
+		// Add view
+		ViewDescriptor viewDescriptor = new ViewDescriptor(new SemanticAdapter(newObject, null), Node.class, graphicalType, ViewUtil.APPEND, true, Activator.DIAGRAM_PREFERENCES_HINT);
+		CreateCommand createViewCommand = new CreateCommand(getTransactionalEditingDomain(), viewDescriptor, containerView);
+		EditorUtils.getDiagramCommandStack().execute(new ICommandProxy(createViewCommand));
+
+		EReference[] erefs = new EReference[]{ NotationPackage.eINSTANCE.getView_Element() };
+		@SuppressWarnings("unchecked")
+		Collection<View> views = EMFCoreUtil.getReferencers(newObject, erefs);
+
+		return (View)views.toArray()[0];
+	}
+
+	public static View createGraphicalLink(IElementType elementType, String graphicalType, View containerView, EditPart sourceEP, EditPart targetEP) throws Exception {
+		CreateConnectionViewRequest request = createConnectionRequest(elementType, sourceEP, targetEP);
+
+		Command command = targetEP.getCommand(request);
+		Assert.assertNotNull("Command to create graphical link should not be null", command);
+		Assert.assertTrue("Command should be executable", command.canExecute());
+
+		EditorUtils.getDiagramCommandStack().execute(command);
+
+		IAdaptable viewAdapter = (IAdaptable)request.getNewObject();
+		View newView = (View)viewAdapter.getAdapter(View.class);
+		Assert.assertNotNull("View should not be null", newView);
+
+		return newView;
+	}
+
+	public static CreateConnectionViewRequest createConnectionRequest(IElementType type, EditPart source, EditPart target) {
+		CreateConnectionViewRequest connectionRequest = CreateViewRequestFactory.getCreateConnectionRequest(type, Activator.DIAGRAM_PREFERENCES_HINT);
+
+		connectionRequest.setSourceEditPart(null);
+		connectionRequest.setTargetEditPart(source);
+		connectionRequest.setType(RequestConstants.REQ_CONNECTION_START);
+		source.getCommand(connectionRequest);
+
+		// Now, setup the request in preparation to get the
+		// connection end
+		// command.
+		connectionRequest.setSourceEditPart(source);
+		connectionRequest.setTargetEditPart(target);
+		connectionRequest.setType(RequestConstants.REQ_CONNECTION_END);
+		return connectionRequest;
+	}
+
+
+	public static View dropFromModelExplorer(IElementType elementType, View containerView) throws Exception {
+		EObject newObject = createElement(elementType, containerView);
+		return dropFromModelExplorer(newObject, containerView);
+	}
+
+	public static View dropFromModelExplorer(EObject eObject, View containerView) throws Exception {
+
+		// Find container EditPart (for command creation)
+		EditPart containerEditPart = getEditPart(containerView);
+
+		// Prepare drop request
+		DropObjectsRequest dropRequest = new DropObjectsRequest();
+		ArrayList<EObject> list = new ArrayList<EObject>();
+		list.add(eObject);
+		dropRequest.setObjects(list);
+		dropRequest.setLocation(new Point(20, 20));
+
+		// Get drop command
+		Command command = containerEditPart.getCommand(dropRequest);
+		EditorUtils.getDiagramCommandStack().execute(command);
+
+		EReference[] erefs = new EReference[]{ NotationPackage.eINSTANCE.getView_Element() };
+		@SuppressWarnings("unchecked")
+		Collection<View> views = EMFCoreUtil.getReferencers(eObject, erefs);
+
+		return (View)views.toArray()[0];
+	}
+}
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/model/Copy of ModelWithPD.di b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/model/Copy of ModelWithPD.di
index bf088778d68..3c8ec0119bd 100644
--- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/model/Copy of ModelWithPD.di
+++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/model/Copy of ModelWithPD.di
@@ -1,17 +1,25 @@
-<?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">

-  <pageList>

-    <availablePage>

-      <emfPageIdentifier href="ModelWithPD.notation#_Fi2LwApyEeOc89pTvmF9Gw"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="ModelWithPD.notation#_Fi2LwApyEeOc89pTvmF9Gw"/>

-        </children>

-      </children>

-    </windows>

-  </sashModel>

-</di:SashWindowsMngr>

+<?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:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
+  <di:SashWindowsMngr>
+	  <pageList>
+	    <availablePage>
+	      <emfPageIdentifier href="ModelWithPD.notation#_Fi2LwApyEeOc89pTvmF9Gw"/>
+	    </availablePage>
+	  </pageList>
+	  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+	    <windows>
+	      <children xsi:type="di:TabFolder">
+	        <children>
+	          <emfPageIdentifier href="ModelWithPD.notation#_Fi2LwApyEeOc89pTvmF9Gw"/>
+	        </children>
+	      </children>
+	    </windows>
+	  </sashModel>
+	</di:SashWindowsMngr>
+  <architecture:ArchitectureDescription contextId="org.eclipse.papyrus.sysml.architecture.SysML"/>
+  <architecture:ArchitectureDescriptionPreferences>
+    <viewpointIds>org.eclipse.papyrus.sysml.analysis</viewpointIds>
+    <viewpointIds>org.eclipse.papyrus.sysml.design</viewpointIds>
+  </architecture:ArchitectureDescriptionPreferences>
+</xmi:XMI>
+	
\ No newline at end of file
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/model/ModelWithPD.di b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/model/ModelWithPD.di
index 734a7eeec94..a9a1f4f5430 100644
--- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/model/ModelWithPD.di
+++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/model/ModelWithPD.di
@@ -1,23 +1,31 @@
-<?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">

-  <pageList>

-    <availablePage>

-      <emfPageIdentifier href="ModelWithPD.notation#_Fi2LwApyEeOc89pTvmF9Gw"/>

-    </availablePage>

-    <availablePage>

-      <emfPageIdentifier href="ModelWithPD.notation#_VpI8wA5KEeO7JIqowJboVA"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="ModelWithPD.notation#_Fi2LwApyEeOc89pTvmF9Gw"/>

-        </children>

-        <children>

-          <emfPageIdentifier href="ModelWithPD.notation#_VpI8wA5KEeO7JIqowJboVA"/>

-        </children>

-      </children>

-    </windows>

-  </sashModel>

-</di:SashWindowsMngr>

+<?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:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
+  <di:SashWindowsMngr>
+	  <pageList>
+	    <availablePage>
+	      <emfPageIdentifier href="ModelWithPD.notation#_Fi2LwApyEeOc89pTvmF9Gw"/>
+	    </availablePage>
+	    <availablePage>
+	      <emfPageIdentifier href="ModelWithPD.notation#_VpI8wA5KEeO7JIqowJboVA"/>
+	    </availablePage>
+	  </pageList>
+	  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+	    <windows>
+	      <children xsi:type="di:TabFolder">
+	        <children>
+	          <emfPageIdentifier href="ModelWithPD.notation#_Fi2LwApyEeOc89pTvmF9Gw"/>
+	        </children>
+	        <children>
+	          <emfPageIdentifier href="ModelWithPD.notation#_VpI8wA5KEeO7JIqowJboVA"/>
+	        </children>
+	      </children>
+	    </windows>
+	  </sashModel>
+	</di:SashWindowsMngr>
+  <architecture:ArchitectureDescription contextId="org.eclipse.papyrus.sysml.architecture.SysML"/>
+  <architecture:ArchitectureDescriptionPreferences>
+    <viewpointIds>org.eclipse.papyrus.sysml.analysis</viewpointIds>
+    <viewpointIds>org.eclipse.papyrus.sysml.design</viewpointIds>
+  </architecture:ArchitectureDescriptionPreferences>
+</xmi:XMI>
+	
\ No newline at end of file
diff --git a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/src/org/eclipse/papyrus/sysml/diagram/parametric/tests/utils/TestPrepareUtils.java b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/src/org/eclipse/papyrus/sysml/diagram/parametric/tests/utils/TestPrepareUtils.java
index a265334f7e2..8e941c84652 100644
--- a/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/src/org/eclipse/papyrus/sysml/diagram/parametric/tests/utils/TestPrepareUtils.java
+++ b/tests/junit/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric.tests/src/org/eclipse/papyrus/sysml/diagram/parametric/tests/utils/TestPrepareUtils.java
@@ -1,295 +1,306 @@
-/*****************************************************************************

- * 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

- *

- * Contributors:

- *		

- *		CEA LIST - Initial API and implementation

- *

- *****************************************************************************/

-package org.eclipse.papyrus.sysml.diagram.parametric.tests.utils;

-

-import static org.eclipse.papyrus.sysml.diagram.parametric.tests.utils.EditorUtils.getEditPart;

-import static org.eclipse.papyrus.sysml.diagram.parametric.tests.utils.EditorUtils.getTransactionalEditingDomain;

-

-import java.util.ArrayList;

-import java.util.Collection;

-

-import org.eclipse.core.commands.ExecutionException;

-import org.eclipse.core.runtime.IAdaptable;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.draw2d.geometry.Point;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.edit.command.SetCommand;

-import org.eclipse.gef.EditPart;

-import org.eclipse.gef.commands.Command;

-import org.eclipse.gmf.runtime.common.core.command.CommandResult;

-import org.eclipse.gmf.runtime.common.core.command.ICommand;

-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;

-import org.eclipse.gmf.runtime.diagram.ui.commands.CreateCommand;

-import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor;

-import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;

-import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;

-import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;

-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;

-import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;

-import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;

-import org.eclipse.gmf.runtime.notation.Node;

-import org.eclipse.gmf.runtime.notation.NotationPackage;

-import org.eclipse.gmf.runtime.notation.View;

-import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;

-import org.eclipse.papyrus.infra.services.edit.commands.ConfigureFeatureCommandFactory;

-import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.papyrus.infra.services.edit.utils.GMFCommandUtils;

-import org.eclipse.papyrus.sysml.blocks.Block;

-import org.eclipse.papyrus.sysml.diagram.parametric.Activator;

-import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;

-import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;

-import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;

-import org.eclipse.uml2.uml.ConnectableElement;

-import org.eclipse.uml2.uml.Connector;

-import org.eclipse.uml2.uml.ConnectorEnd;

-import org.eclipse.uml2.uml.Element;

-import org.eclipse.uml2.uml.EncapsulatedClassifier;

-import org.eclipse.uml2.uml.Property;

-import org.eclipse.uml2.uml.UMLPackage;

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

-import org.junit.Assert;

-

-

-public class TestPrepareUtils {

-

-	public static void changeVisibility(View view) throws Exception {

-		SetCommand changeVisibilityCommand = new SetCommand(getTransactionalEditingDomain(), view, NotationPackage.eINSTANCE.getView_Visible(), !view.isVisible());

-		getTransactionalEditingDomain().getCommandStack().execute(changeVisibilityCommand);

-	}

-

-	public static EObject createElement(IElementType elementType, View containerView) throws Exception {

-		return createElement(elementType, containerView.getElement());

-	}

-

-	@SuppressWarnings("unchecked")

-	public static EObject createElement(IElementType elementType, EObject container) throws Exception {

-		CreateElementRequest createElementRequest = new CreateElementRequest(getTransactionalEditingDomain(), container, elementType);

-

-		EObject typeOwner = EMFCoreUtil.getContainer(container, UMLPackage.eINSTANCE.getPackage());

-

-		if(elementType == SysMLElementTypes.CONSTRAINT_PROPERTY) {

-			// Create type

-			CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), typeOwner, SysMLElementTypes.CONSTRAINT_BLOCK);

-			ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(typeOwner).getEditCommand(createTypeRequest);

-			getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createTypeCommand));

-

-			// If container is a Property, substitute container by the Property type

-			if(container instanceof Property) {

-				container = ((Property)container).getType();

-				createElementRequest.setContainer(container);

-			}

-			createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));

-

-		} else if(elementType == SysMLElementTypes.PART_PROPERTY) {

-			// Create type

-			CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), typeOwner, SysMLElementTypes.BLOCK);

-			ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(typeOwner).getEditCommand(createTypeRequest);

-			getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createTypeCommand));

-

-			// If container is a Property, substitute container by the Property type

-			if(container instanceof Property) {

-				container = ((Property)container).getType();

-				createElementRequest.setContainer(container);

-			}

-			createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));

-

-		} else if(elementType == SysMLElementTypes.REFERENCE_PROPERTY) {

-			// Create type

-			CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), typeOwner, SysMLElementTypes.BLOCK);

-			ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(typeOwner).getEditCommand(createTypeRequest);

-			getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createTypeCommand));

-

-			// If container is a Property, substitute container by the Property type

-			if(container instanceof Property) {

-				container = ((Property)container).getType();

-				createElementRequest.setContainer(container);

-			}

-			createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));

-

-		} else if(elementType == SysMLElementTypes.VALUE_PROPERTY) {

-			// Create type

-			CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), typeOwner, UMLElementTypes.DATA_TYPE);

-			ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(typeOwner).getEditCommand(createTypeRequest);

-			getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createTypeCommand));

-

-			// If container is a Property, substitute container by the Property type

-			if(container instanceof Property) {

-				container = ((Property)container).getType();

-				createElementRequest.setContainer(container);

-			}

-			createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));

-

-		} else if(elementType == UMLElementTypes.PROPERTY) {

-

-			// If container is a Property, substitute container by the Property type

-			if(container instanceof Property) {

-				container = ((Property)container).getType();

-				createElementRequest.setContainer(container);

-			}

-		}

-

-		ICommand createElementCommand = ElementEditServiceUtils.getCommandProvider(container).getEditCommand(createElementRequest);

-		getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createElementCommand));

-

-		return GMFCommandUtils.getCommandEObjectResult(createElementCommand);

-	}

-

-	public static void setBlockIsEncapsulated(final Element block, final boolean isEncapsulated) throws Exception {

-		AbstractTransactionalCommand setCommand = new AbstractTransactionalCommand(getTransactionalEditingDomain(), "Set Block isEncapsulated", null) {

-

-			@Override

-			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-				Block blockApp = UMLUtil.getStereotypeApplication(block, Block.class);

-				blockApp.setIsEncapsulated(isEncapsulated);

-				return CommandResult.newOKCommandResult(block);

-			}

-		};

-		getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(setCommand));

-	}

-

-	public static EObject createLink(IElementType elementType, EObject source, EObject target) throws Exception {

-		CreateRelationshipRequest createRelationshipRequest = new CreateRelationshipRequest(getTransactionalEditingDomain(), source, target, elementType);

-

-		ICommand createRelationshipCommand = ElementEditServiceUtils.getCommandProvider(elementType).getEditCommand(createRelationshipRequest);

-		getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createRelationshipCommand));

-

-		return GMFCommandUtils.getCommandEObjectResult(createRelationshipCommand);

-	}

-

-	public static EObject createConnectorLink(final EncapsulatedClassifier container, final ConnectableElement sourceRole, final Property sourcePartWithPort, final ConnectableElement targetRole, final Property targetPartWithPort) throws Exception {

-

-		AbstractTransactionalCommand createConnectorCommand = new AbstractTransactionalCommand(getTransactionalEditingDomain(), "Create connector", null) {

-

-			@Override

-			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {

-				Connector connector = container.createOwnedConnector("ConnectorTest");

-

-				ConnectorEnd connectorEndSrc = connector.createEnd();

-				connectorEndSrc.setRole(sourceRole);

-				connectorEndSrc.setPartWithPort(sourcePartWithPort);

-

-				ConnectorEnd connectorEndTgt = connector.createEnd();

-				connectorEndTgt.setRole(targetRole);

-				connectorEndTgt.setPartWithPort(targetPartWithPort);

-

-				return CommandResult.newOKCommandResult(connector);

-			}

-

-		};

-

-		getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createConnectorCommand));

-

-		return GMFCommandUtils.getCommandEObjectResult(createConnectorCommand);

-	}

-

-	public static View createGraphicalNode(IElementType elementType, String graphicalType, View containerView) throws Exception {

-		EObject newObject = createElement(elementType, containerView);

-

-		// Add view

-		ViewDescriptor viewDescriptor = new ViewDescriptor(new SemanticAdapter(newObject, null), Node.class, graphicalType, ViewUtil.APPEND, true, Activator.DIAGRAM_PREFERENCES_HINT);

-		CreateCommand createViewCommand = new CreateCommand(getTransactionalEditingDomain(), viewDescriptor, containerView);

-		Assert.assertTrue("Command should be executable", createViewCommand.canExecute());

-		EditorUtils.getDiagramCommandStack().execute(new ICommandProxy(createViewCommand));

-

-		EReference[] erefs = new EReference[]{ NotationPackage.eINSTANCE.getView_Element() };

-		@SuppressWarnings("unchecked")

-		Collection<View> views = EMFCoreUtil.getReferencers(newObject, erefs);

-

-		return (View)views.toArray()[0];

-	}

-

-	public static View createGraphicalNode(IElementType elementType, EObject semanticContainer, String graphicalType, View containerView) throws Exception {

-

-		EObject newObject = createElement(elementType, semanticContainer);

-

-		// Add view

-		ViewDescriptor viewDescriptor = new ViewDescriptor(new SemanticAdapter(newObject, null), Node.class, graphicalType, ViewUtil.APPEND, true, Activator.DIAGRAM_PREFERENCES_HINT);

-		CreateCommand createViewCommand = new CreateCommand(getTransactionalEditingDomain(), viewDescriptor, containerView);

-		EditorUtils.getDiagramCommandStack().execute(new ICommandProxy(createViewCommand));

-

-		EReference[] erefs = new EReference[]{ NotationPackage.eINSTANCE.getView_Element() };

-		@SuppressWarnings("unchecked")

-		Collection<View> views = EMFCoreUtil.getReferencers(newObject, erefs);

-

-		return (View)views.toArray()[0];

-	}

-

-	public static View createGraphicalLink(IElementType elementType, String graphicalType, View containerView, EditPart sourceEP, EditPart targetEP) throws Exception {

-		CreateConnectionViewRequest request = createConnectionRequest(elementType, sourceEP, targetEP);

-

-		Command command = targetEP.getCommand(request);

-		Assert.assertNotNull("Command to create graphical link should not be null", command);

-		Assert.assertTrue("Command should be executable", command.canExecute());

-

-		EditorUtils.getDiagramCommandStack().execute(command);

-

-		IAdaptable viewAdapter = (IAdaptable)request.getNewObject();

-		View newView = (View)viewAdapter.getAdapter(View.class);

-		Assert.assertNotNull("View should not be null", newView);

-

-		return newView;

-	}

-

-	public static CreateConnectionViewRequest createConnectionRequest(IElementType type, EditPart source, EditPart target) {

-		CreateConnectionViewRequest connectionRequest = CreateViewRequestFactory.getCreateConnectionRequest(type, Activator.DIAGRAM_PREFERENCES_HINT);

-

-		connectionRequest.setSourceEditPart(null);

-		connectionRequest.setTargetEditPart(source);

-		connectionRequest.setType(RequestConstants.REQ_CONNECTION_START);

-		source.getCommand(connectionRequest);

-

-		// Now, setup the request in preparation to get the

-		// connection end

-		// command.

-		connectionRequest.setSourceEditPart(source);

-		connectionRequest.setTargetEditPart(target);

-		connectionRequest.setType(RequestConstants.REQ_CONNECTION_END);

-		return connectionRequest;

-	}

-

-

-	public static View dropFromModelExplorer(IElementType elementType, View containerView) throws Exception {

-		EObject newObject = createElement(elementType, containerView);

-		return dropFromModelExplorer(newObject, containerView);

-	}

-

-	public static View dropFromModelExplorer(EObject eObject, View containerView) throws Exception {

-

-		// Find container EditPart (for command creation)

-		EditPart containerEditPart = getEditPart(containerView);

-

-		// Prepare drop request

-		DropObjectsRequest dropRequest = new DropObjectsRequest();

-		ArrayList<EObject> list = new ArrayList<EObject>();

-		list.add(eObject);

-		dropRequest.setObjects(list);

-		dropRequest.setLocation(new Point(20, 20));

-

-		// Get drop command

-		Command command = containerEditPart.getCommand(dropRequest);

-		EditorUtils.getDiagramCommandStack().execute(command);

-

-		EReference[] erefs = new EReference[]{ NotationPackage.eINSTANCE.getView_Element() };

-		@SuppressWarnings("unchecked")

-		Collection<View> views = EMFCoreUtil.getReferencers(eObject, erefs);

-

-		return (View)views.toArray()[0];

-	}

-}

+/*****************************************************************************
+ * 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
+ *
+ * Contributors:
+ *		
+ *		CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.sysml.diagram.parametric.tests.utils;
+
+import static org.eclipse.papyrus.sysml.diagram.parametric.tests.utils.EditorUtils.getEditPart;
+import static org.eclipse.papyrus.sysml.diagram.parametric.tests.utils.EditorUtils.getTransactionalEditingDomain;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.edit.command.SetCommand;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
+import org.eclipse.gmf.runtime.diagram.ui.commands.CreateCommand;
+import org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor;
+import org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequestFactory;
+import org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest;
+import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
+import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
+import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
+import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
+import org.eclipse.gmf.runtime.notation.Node;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.services.edit.commands.ConfigureFeatureCommandFactory;
+import org.eclipse.papyrus.infra.services.edit.commands.IConfigureCommandFactory;
+import org.eclipse.papyrus.infra.services.edit.context.TypeContext;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.utils.GMFCommandUtils;
+import org.eclipse.papyrus.sysml.blocks.Block;
+import org.eclipse.papyrus.sysml.diagram.parametric.Activator;
+import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
+import org.eclipse.papyrus.uml.diagram.common.commands.SemanticAdapter;
+import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
+import org.eclipse.uml2.uml.ConnectableElement;
+import org.eclipse.uml2.uml.Connector;
+import org.eclipse.uml2.uml.ConnectorEnd;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.EncapsulatedClassifier;
+import org.eclipse.uml2.uml.Property;
+import org.eclipse.uml2.uml.UMLPackage;
+import org.eclipse.uml2.uml.util.UMLUtil;
+import org.junit.Assert;
+
+
+public class TestPrepareUtils {
+
+	public static void changeVisibility(View view) throws Exception {
+		SetCommand changeVisibilityCommand = new SetCommand(getTransactionalEditingDomain(), view, NotationPackage.eINSTANCE.getView_Visible(), !view.isVisible());
+		getTransactionalEditingDomain().getCommandStack().execute(changeVisibilityCommand);
+	}
+
+	public static EObject createElement(IElementType elementType, View containerView) throws Exception {
+		return createElement(elementType, containerView.getElement());
+	}
+
+	@SuppressWarnings("unchecked")
+	public static EObject createElement(IElementType elementType, EObject container) throws Exception {
+		CreateElementRequest createElementRequest = new CreateElementRequest(getTransactionalEditingDomain(), container, elementType);
+
+		EObject typeOwner = EMFCoreUtil.getContainer(container, UMLPackage.eINSTANCE.getPackage());
+
+		if(elementType == SysMLElementTypes.CONSTRAINT_PROPERTY) {
+			// Create type
+			CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), typeOwner, SysMLElementTypes.CONSTRAINT_BLOCK);
+			ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(typeOwner).getEditCommand(createTypeRequest);
+			getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createTypeCommand));
+
+			// If container is a Property, substitute container by the Property type
+			if(container instanceof Property) {
+				container = ((Property)container).getType();
+				createElementRequest.setContainer(container);
+			}
+			createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));
+
+		} else if(elementType == SysMLElementTypes.PART_PROPERTY) {
+			// Create type
+			CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), typeOwner, SysMLElementTypes.BLOCK);
+			ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(typeOwner).getEditCommand(createTypeRequest);
+			getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createTypeCommand));
+
+			// If container is a Property, substitute container by the Property type
+			if(container instanceof Property) {
+				container = ((Property)container).getType();
+				createElementRequest.setContainer(container);
+			}
+			createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));
+
+		} else if(elementType == SysMLElementTypes.REFERENCE_PROPERTY) {
+			// Create type
+			CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), typeOwner, SysMLElementTypes.BLOCK);
+			ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(typeOwner).getEditCommand(createTypeRequest);
+			getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createTypeCommand));
+
+			// If container is a Property, substitute container by the Property type
+			if(container instanceof Property) {
+				container = ((Property)container).getType();
+				createElementRequest.setContainer(container);
+			}
+			createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));
+
+		} else if(elementType == SysMLElementTypes.VALUE_PROPERTY) {
+			// Create type
+			CreateElementRequest createTypeRequest = new CreateElementRequest(getTransactionalEditingDomain(), typeOwner, UMLElementTypes.DATA_TYPE);
+			ICommand createTypeCommand = ElementEditServiceUtils.getCommandProvider(typeOwner).getEditCommand(createTypeRequest);
+			getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createTypeCommand));
+
+			// If container is a Property, substitute container by the Property type
+			if(container instanceof Property) {
+				container = ((Property)container).getType();
+				createElementRequest.setContainer(container);
+			}
+			createElementRequest.getParameters().put(IConfigureCommandFactory.CONFIGURE_COMMAND_FACTORY_ID, new ConfigureFeatureCommandFactory(UMLPackage.eINSTANCE.getTypedElement_Type(), GMFCommandUtils.getCommandEObjectResult(createTypeCommand)));
+
+		} else if(elementType == UMLElementTypes.PROPERTY) {
+
+			// If container is a Property, substitute container by the Property type
+			if(container instanceof Property) {
+				container = ((Property)container).getType();
+				createElementRequest.setContainer(container);
+			}
+		}
+
+		ICommand createElementCommand = ElementEditServiceUtils.getCommandProvider(container).getEditCommand(createElementRequest);
+		getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createElementCommand));
+
+		return GMFCommandUtils.getCommandEObjectResult(createElementCommand);
+	}
+
+	public static void setBlockIsEncapsulated(final Element block, final boolean isEncapsulated) throws Exception {
+		AbstractTransactionalCommand setCommand = new AbstractTransactionalCommand(getTransactionalEditingDomain(), "Set Block isEncapsulated", null) {
+
+			@Override
+			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+				Block blockApp = UMLUtil.getStereotypeApplication(block, Block.class);
+				blockApp.setIsEncapsulated(isEncapsulated);
+				return CommandResult.newOKCommandResult(block);
+			}
+		};
+		getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(setCommand));
+	}
+
+	public static EObject createLink(IElementType elementType, EObject source, EObject target) throws Exception {
+		CreateRelationshipRequest createRelationshipRequest = new CreateRelationshipRequest(getTransactionalEditingDomain(), source, target, elementType);
+
+		IClientContext context;
+		try {
+			context = TypeContext.getContext(getTransactionalEditingDomain());
+		} catch (ServiceException e) {
+			Activator.log.error(e);
+			return null;
+		}
+
+		ICommand createRelationshipCommand = ElementEditServiceUtils.getCommandProvider(elementType, context).getEditCommand(createRelationshipRequest);
+		getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createRelationshipCommand));
+
+		return GMFCommandUtils.getCommandEObjectResult(createRelationshipCommand);
+	}
+
+	public static EObject createConnectorLink(final EncapsulatedClassifier container, final ConnectableElement sourceRole, final Property sourcePartWithPort, final ConnectableElement targetRole, final Property targetPartWithPort) throws Exception {
+
+		AbstractTransactionalCommand createConnectorCommand = new AbstractTransactionalCommand(getTransactionalEditingDomain(), "Create connector", null) {
+
+			@Override
+			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
+				Connector connector = container.createOwnedConnector("ConnectorTest");
+
+				ConnectorEnd connectorEndSrc = connector.createEnd();
+				connectorEndSrc.setRole(sourceRole);
+				connectorEndSrc.setPartWithPort(sourcePartWithPort);
+
+				ConnectorEnd connectorEndTgt = connector.createEnd();
+				connectorEndTgt.setRole(targetRole);
+				connectorEndTgt.setPartWithPort(targetPartWithPort);
+
+				return CommandResult.newOKCommandResult(connector);
+			}
+
+		};
+
+		getTransactionalEditingDomain().getCommandStack().execute(new GMFtoEMFCommandWrapper(createConnectorCommand));
+
+		return GMFCommandUtils.getCommandEObjectResult(createConnectorCommand);
+	}
+
+	public static View createGraphicalNode(IElementType elementType, String graphicalType, View containerView) throws Exception {
+		EObject newObject = createElement(elementType, containerView);
+
+		// Add view
+		ViewDescriptor viewDescriptor = new ViewDescriptor(new SemanticAdapter(newObject, null), Node.class, graphicalType, ViewUtil.APPEND, true, Activator.DIAGRAM_PREFERENCES_HINT);
+		CreateCommand createViewCommand = new CreateCommand(getTransactionalEditingDomain(), viewDescriptor, containerView);
+		Assert.assertTrue("Command should be executable", createViewCommand.canExecute());
+		EditorUtils.getDiagramCommandStack().execute(new ICommandProxy(createViewCommand));
+
+		EReference[] erefs = new EReference[]{ NotationPackage.eINSTANCE.getView_Element() };
+		@SuppressWarnings("unchecked")
+		Collection<View> views = EMFCoreUtil.getReferencers(newObject, erefs);
+
+		return (View)views.toArray()[0];
+	}
+
+	public static View createGraphicalNode(IElementType elementType, EObject semanticContainer, String graphicalType, View containerView) throws Exception {
+
+		EObject newObject = createElement(elementType, semanticContainer);
+
+		// Add view
+		ViewDescriptor viewDescriptor = new ViewDescriptor(new SemanticAdapter(newObject, null), Node.class, graphicalType, ViewUtil.APPEND, true, Activator.DIAGRAM_PREFERENCES_HINT);
+		CreateCommand createViewCommand = new CreateCommand(getTransactionalEditingDomain(), viewDescriptor, containerView);
+		EditorUtils.getDiagramCommandStack().execute(new ICommandProxy(createViewCommand));
+
+		EReference[] erefs = new EReference[]{ NotationPackage.eINSTANCE.getView_Element() };
+		@SuppressWarnings("unchecked")
+		Collection<View> views = EMFCoreUtil.getReferencers(newObject, erefs);
+
+		return (View)views.toArray()[0];
+	}
+
+	public static View createGraphicalLink(IElementType elementType, String graphicalType, View containerView, EditPart sourceEP, EditPart targetEP) throws Exception {
+		CreateConnectionViewRequest request = createConnectionRequest(elementType, sourceEP, targetEP);
+
+		Command command = targetEP.getCommand(request);
+		Assert.assertNotNull("Command to create graphical link should not be null", command);
+		Assert.assertTrue("Command should be executable", command.canExecute());
+
+		EditorUtils.getDiagramCommandStack().execute(command);
+
+		IAdaptable viewAdapter = (IAdaptable)request.getNewObject();
+		View newView = (View)viewAdapter.getAdapter(View.class);
+		Assert.assertNotNull("View should not be null", newView);
+
+		return newView;
+	}
+
+	public static CreateConnectionViewRequest createConnectionRequest(IElementType type, EditPart source, EditPart target) {
+		CreateConnectionViewRequest connectionRequest = CreateViewRequestFactory.getCreateConnectionRequest(type, Activator.DIAGRAM_PREFERENCES_HINT);
+
+		connectionRequest.setSourceEditPart(null);
+		connectionRequest.setTargetEditPart(source);
+		connectionRequest.setType(RequestConstants.REQ_CONNECTION_START);
+		source.getCommand(connectionRequest);
+
+		// Now, setup the request in preparation to get the
+		// connection end
+		// command.
+		connectionRequest.setSourceEditPart(source);
+		connectionRequest.setTargetEditPart(target);
+		connectionRequest.setType(RequestConstants.REQ_CONNECTION_END);
+		return connectionRequest;
+	}
+
+
+	public static View dropFromModelExplorer(IElementType elementType, View containerView) throws Exception {
+		EObject newObject = createElement(elementType, containerView);
+		return dropFromModelExplorer(newObject, containerView);
+	}
+
+	public static View dropFromModelExplorer(EObject eObject, View containerView) throws Exception {
+
+		// Find container EditPart (for command creation)
+		EditPart containerEditPart = getEditPart(containerView);
+
+		// Prepare drop request
+		DropObjectsRequest dropRequest = new DropObjectsRequest();
+		ArrayList<EObject> list = new ArrayList<EObject>();
+		list.add(eObject);
+		dropRequest.setObjects(list);
+		dropRequest.setLocation(new Point(20, 20));
+
+		// Get drop command
+		Command command = containerEditPart.getCommand(dropRequest);
+		EditorUtils.getDiagramCommandStack().execute(command);
+
+		EReference[] erefs = new EReference[]{ NotationPackage.eINSTANCE.getView_Element() };
+		@SuppressWarnings("unchecked")
+		Collection<View> views = EMFCoreUtil.getReferencers(eObject, erefs);
+
+		return (View)views.toArray()[0];
+	}
+}
diff --git a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.tests/resources/modelSysMLRequirement.di b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.tests/resources/modelSysMLRequirement.di
index cb4ecb440a9..5e3ea0eea85 100755
--- a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.tests/resources/modelSysMLRequirement.di
+++ b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.allocation.tests/resources/modelSysMLRequirement.di
@@ -1,54 +1,54 @@
-<?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" >

-

-  <di:SashWindowsMngr>

-    <pageList>

-      <availablePage>

-        <emfPageIdentifier href="modelSysMLRequirement.notation#_pBS2xAKOEeSZ5cZUOQKWkw"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="modelSysMLRequirement.notation#_B7qCgAKPEeSZ5cZUOQKWkw"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="modelSysMLRequirement.notation#_C2IGsAKPEeSZ5cZUOQKWkw"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="modelSysMLRequirement.notation#_EGhXkAKPEeSZ5cZUOQKWkw"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="modelSysMLRequirement.notation#_ffxOYAKUEeSZ5cZUOQKWkw"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="modelSysMLRequirement.notation#_ZfPQ8Av4EeSOiKqWiKPo8w"/>

-      </availablePage>

-    </pageList>

-    <sashModel currentSelection="/0/@sashModel/@windows.0/@children.0">

-      <windows>

-        <children xsi:type="di:TabFolder">

-          <children>

-            <emfPageIdentifier href="modelSysMLRequirement.notation#_pBS2xAKOEeSZ5cZUOQKWkw"/>

-          </children>

-          <children>

-            <emfPageIdentifier href="modelSysMLRequirement.notation#_B7qCgAKPEeSZ5cZUOQKWkw"/>

-          </children>

-          <children>

-            <emfPageIdentifier href="modelSysMLRequirement.notation#_EGhXkAKPEeSZ5cZUOQKWkw"/>

-          </children>

-          <children>

-            <emfPageIdentifier href="modelSysMLRequirement.notation#_C2IGsAKPEeSZ5cZUOQKWkw"/>

-          </children>

-          <children>

-            <emfPageIdentifier href="modelSysMLRequirement.notation#_ffxOYAKUEeSZ5cZUOQKWkw"/>

-          </children>

-          <children>

-            <emfPageIdentifier href="modelSysMLRequirement.notation#_ZfPQ8Av4EeSOiKqWiKPo8w"/>

-          </children>

-        </children>

-      </windows>

-    </sashModel>

-  </di:SashWindowsMngr>

-  

-</xmi:XMI>

+<?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" >
+   <di:SashWindowsMngr>
+    <pageList>
+      <availablePage>
+        <emfPageIdentifier href="modelSysMLRequirement.notation#_pBS2xAKOEeSZ5cZUOQKWkw"/>
+      </availablePage>
+      <availablePage>
+        <emfPageIdentifier href="modelSysMLRequirement.notation#_B7qCgAKPEeSZ5cZUOQKWkw"/>
+      </availablePage>
+      <availablePage>
+        <emfPageIdentifier href="modelSysMLRequirement.notation#_C2IGsAKPEeSZ5cZUOQKWkw"/>
+      </availablePage>
+      <availablePage>
+        <emfPageIdentifier href="modelSysMLRequirement.notation#_EGhXkAKPEeSZ5cZUOQKWkw"/>
+      </availablePage>
+      <availablePage>
+        <emfPageIdentifier href="modelSysMLRequirement.notation#_ffxOYAKUEeSZ5cZUOQKWkw"/>
+      </availablePage>
+      <availablePage>
+        <emfPageIdentifier href="modelSysMLRequirement.notation#_ZfPQ8Av4EeSOiKqWiKPo8w"/>
+      </availablePage>
+    </pageList>
+    <sashModel currentSelection="/0/@sashModel/@windows.0/@children.0">
+      <windows>
+        <children xsi:type="di:TabFolder">
+          <children>
+            <emfPageIdentifier href="modelSysMLRequirement.notation#_pBS2xAKOEeSZ5cZUOQKWkw"/>
+          </children>
+          <children>
+            <emfPageIdentifier href="modelSysMLRequirement.notation#_B7qCgAKPEeSZ5cZUOQKWkw"/>
+          </children>
+          <children>
+            <emfPageIdentifier href="modelSysMLRequirement.notation#_EGhXkAKPEeSZ5cZUOQKWkw"/>
+          </children>
+          <children>
+            <emfPageIdentifier href="modelSysMLRequirement.notation#_C2IGsAKPEeSZ5cZUOQKWkw"/>
+          </children>
+          <children>
+            <emfPageIdentifier href="modelSysMLRequirement.notation#_ffxOYAKUEeSZ5cZUOQKWkw"/>
+          </children>
+          <children>
+            <emfPageIdentifier href="modelSysMLRequirement.notation#_ZfPQ8Av4EeSOiKqWiKPo8w"/>
+          </children>
+        </children>
+      </windows>
+    </sashModel>
+  </di:SashWindowsMngr>
+  <architecture:ArchitectureDescription contextId="org.eclipse.papyrus.sysml.architecture.SysML"/>
+  <architecture:ArchitectureDescriptionPreferences>
+    <viewpointIds>org.eclipse.papyrus.sysml.analysis</viewpointIds>
+    <viewpointIds>org.eclipse.papyrus.sysml.design</viewpointIds>
+  </architecture:ArchitectureDescriptionPreferences>
+</xmi:XMI>
diff --git a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/SysMLNatTableRequirementTests.launch b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/SysMLNatTableRequirementTests.launch
deleted file mode 100644
index 3248c1b5f0d..00000000000
--- a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/SysMLNatTableRequirementTests.launch
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">

-<booleanAttribute key="append.args" value="true"/>

-<booleanAttribute key="askclear" value="false"/>

-<booleanAttribute key="automaticAdd" value="true"/>

-<booleanAttribute key="automaticValidate" value="false"/>

-<stringAttribute key="bootstrap" value=""/>

-<stringAttribute key="checked" value="[NONE]"/>

-<listAttribute key="classFilters">

-<listEntry value="ClassFilter(include, org.eclipse.papyrus.infra.emf.*)"/>

-<listEntry value="ClassFilter(include, org.eclipse.papyrus.uml.tools.*)"/>

-<listEntry value="ClassFilter(include, *.tests.*)"/>

-</listAttribute>

-<booleanAttribute key="clearConfig" value="true"/>

-<booleanAttribute key="clearws" value="true"/>

-<booleanAttribute key="clearwslog" value="false"/>

-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>

-<booleanAttribute key="default" value="true"/>

-<booleanAttribute key="includeOptional" value="true"/>

-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

-<listEntry value="/org.eclipse.papyrus.sysml.nattable.requirement.tests/src/org/eclipse/papyrus/sysml/nattable/requirement/tests/tests/AllTests.java"/>

-</listAttribute>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

-<listEntry value="1"/>

-</listAttribute>

-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>

-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>

-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>

-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>

-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.sysml.nattable.requirement.tests.tests.AllTests"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.sysml.nattable.requirement.tests"/>

-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -Xms120m -Xmx512m -XX:PermSize=256M -XX:MaxPermSize=512M"/>

-<stringAttribute key="pde.version" value="3.3"/>

-<stringAttribute key="product" value="org.eclipse.platform.ide"/>

-<booleanAttribute key="run_in_ui_thread" value="true"/>

-<booleanAttribute key="show_selected_only" value="false"/>

-<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>

-<booleanAttribute key="tracing" value="false"/>

-<booleanAttribute key="useCustomFeatures" value="false"/>

-<booleanAttribute key="useDefaultConfig" value="true"/>

-<booleanAttribute key="useDefaultConfigArea" value="false"/>

-<booleanAttribute key="useProduct" value="true"/>

-</launchConfiguration>

diff --git a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/resources/sysmlModel.di b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/resources/sysmlModel.di
index 279b08e24e1..1b030e72138 100644
--- a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/resources/sysmlModel.di
+++ b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/resources/sysmlModel.di
@@ -1,9 +1,17 @@
-<?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">

-  <pageList/>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder"/>

-    </windows>

-  </sashModel>

-</di:SashWindowsMngr>

+<?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:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
+  <di:SashWindowsMngr>
+	  <pageList/>
+	  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+	    <windows>
+	      <children xsi:type="di:TabFolder"/>
+	    </windows>
+	  </sashModel>
+	</di:SashWindowsMngr>
+  <architecture:ArchitectureDescription contextId="org.eclipse.papyrus.sysml.architecture.SysML"/>
+  <architecture:ArchitectureDescriptionPreferences>
+    <viewpointIds>org.eclipse.papyrus.sysml.analysis</viewpointIds>
+    <viewpointIds>org.eclipse.papyrus.sysml.design</viewpointIds>
+  </architecture:ArchitectureDescriptionPreferences>
+</xmi:XMI>
+	
\ No newline at end of file
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/model/Bug435197.di b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/model/Bug435197.di
index 006edbd98cc..abcec13590d 100644
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/model/Bug435197.di
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/model/Bug435197.di
@@ -1,47 +1,55 @@
 <?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">
-  <pageList>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-    <availablePage/>
-  </pageList>
-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
-    <windows>
-      <children xsi:type="di:TabFolder"/>
-    </windows>
-  </sashModel>
-</di:SashWindowsMngr>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
+  <di:SashWindowsMngr>
+	  <pageList>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	    <availablePage/>
+	  </pageList>
+	  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+	    <windows>
+	      <children xsi:type="di:TabFolder"/>
+	    </windows>
+	  </sashModel>
+	</di:SashWindowsMngr>
+  <architecture:ArchitectureDescription contextId="org.eclipse.papyrus.sysml.architecture.SysML"/>
+  <architecture:ArchitectureDescriptionPreferences>
+    <viewpointIds>org.eclipse.papyrus.sysml.analysis</viewpointIds>
+    <viewpointIds>org.eclipse.papyrus.sysml.design</viewpointIds>
+  </architecture:ArchitectureDescriptionPreferences>
+</xmi:XMI>
+	
\ No newline at end of file
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/model/ModelWithBDD.di b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/model/ModelWithBDD.di
index 3422e22dab1..ce0a01bc94c 100644
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/model/ModelWithBDD.di
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/model/ModelWithBDD.di
@@ -1,29 +1,37 @@
-<?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="ModelWithBDD.notation#_LXISYJdgEeCIWccnqNjPug"/>

-    </availablePage>

-    <availablePage>

-      <emfPageIdentifier href="ModelWithBDD.notation#_D85CYKWDEeG49_vdcs7Y7g"/>

-    </availablePage>

-    <availablePage>

-      <emfPageIdentifier href="ModelWithBDD.notation#_flho4LnoEeG1Fot6xcIh4g"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="ModelWithBDD.notation#_LXISYJdgEeCIWccnqNjPug"/>

-        </children>

-        <children>

-          <emfPageIdentifier href="ModelWithBDD.notation#_D85CYKWDEeG49_vdcs7Y7g"/>

-        </children>

-        <children>

-          <emfPageIdentifier href="ModelWithBDD.notation#_flho4LnoEeG1Fot6xcIh4g"/>

-        </children>

-      </children>

-    </windows>

-  </sashModel>

-</di:SashWindowsMngr>

+<?xml version="1.0" encoding="ASCII"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
+  <di:SashWindowsMngr>
+	  <pageList>
+	    <availablePage>
+	      <emfPageIdentifier href="ModelWithBDD.notation#_LXISYJdgEeCIWccnqNjPug"/>
+	    </availablePage>
+	    <availablePage>
+	      <emfPageIdentifier href="ModelWithBDD.notation#_D85CYKWDEeG49_vdcs7Y7g"/>
+	    </availablePage>
+	    <availablePage>
+	      <emfPageIdentifier href="ModelWithBDD.notation#_flho4LnoEeG1Fot6xcIh4g"/>
+	    </availablePage>
+	  </pageList>
+	  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+	    <windows>
+	      <children xsi:type="di:TabFolder">
+	        <children>
+	          <emfPageIdentifier href="ModelWithBDD.notation#_LXISYJdgEeCIWccnqNjPug"/>
+	        </children>
+	        <children>
+	          <emfPageIdentifier href="ModelWithBDD.notation#_D85CYKWDEeG49_vdcs7Y7g"/>
+	        </children>
+	        <children>
+	          <emfPageIdentifier href="ModelWithBDD.notation#_flho4LnoEeG1Fot6xcIh4g"/>
+	        </children>
+	      </children>
+	    </windows>
+	  </sashModel>
+	</di:SashWindowsMngr>
+  <architecture:ArchitectureDescription contextId="org.eclipse.papyrus.sysml.architecture.SysML"/>
+  <architecture:ArchitectureDescriptionPreferences>
+    <viewpointIds>org.eclipse.papyrus.sysml.analysis</viewpointIds>
+    <viewpointIds>org.eclipse.papyrus.sysml.design</viewpointIds>
+  </architecture:ArchitectureDescriptionPreferences>
+</xmi:XMI>
+	
\ No newline at end of file
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/model/SysMLModelExplorerCopyPasteTestModel.di b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/model/SysMLModelExplorerCopyPasteTestModel.di
index 86d19ca6083..715509f6e10 100644
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/model/SysMLModelExplorerCopyPasteTestModel.di
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.modelexplorer.tests/model/SysMLModelExplorerCopyPasteTestModel.di
@@ -1,35 +1,43 @@
-<?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="SysMLModelExplorerCopyPasteTestModel.notation#_TmNkwHpOEeGpML05YPbTgg"/>

-    </availablePage>

-    <availablePage>

-      <emfPageIdentifier href="SysMLModelExplorerCopyPasteTestModel.notation#_skVUkHphEeGr6LTFg6LEhg"/>

-    </availablePage>

-    <availablePage>

-      <emfPageIdentifier href="SysMLModelExplorerCopyPasteTestModel.notation#_ByR8IH2bEeGYcfVa7z8CyQ"/>

-    </availablePage>

-    <availablePage>

-      <emfPageIdentifier href="SysMLModelExplorerCopyPasteTestModel.notation#_4Yzc4KW-EeGN-cBhs2fFJg"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="SysMLModelExplorerCopyPasteTestModel.notation#_TmNkwHpOEeGpML05YPbTgg"/>

-        </children>

-        <children>

-          <emfPageIdentifier href="SysMLModelExplorerCopyPasteTestModel.notation#_skVUkHphEeGr6LTFg6LEhg"/>

-        </children>

-        <children>

-          <emfPageIdentifier href="SysMLModelExplorerCopyPasteTestModel.notation#_ByR8IH2bEeGYcfVa7z8CyQ"/>

-        </children>

-        <children>

-          <emfPageIdentifier href="SysMLModelExplorerCopyPasteTestModel.notation#_4Yzc4KW-EeGN-cBhs2fFJg"/>

-        </children>

-      </children>

-    </windows>

-  </sashModel>

-</di:SashWindowsMngr>

+<?xml version="1.0" encoding="ASCII"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:architecture="http://www.eclipse.org/papyrus/infra/core/architecture" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
+  <di:SashWindowsMngr>
+	  <pageList>
+	    <availablePage>
+	      <emfPageIdentifier href="SysMLModelExplorerCopyPasteTestModel.notation#_TmNkwHpOEeGpML05YPbTgg"/>
+	    </availablePage>
+	    <availablePage>
+	      <emfPageIdentifier href="SysMLModelExplorerCopyPasteTestModel.notation#_skVUkHphEeGr6LTFg6LEhg"/>
+	    </availablePage>
+	    <availablePage>
+	      <emfPageIdentifier href="SysMLModelExplorerCopyPasteTestModel.notation#_ByR8IH2bEeGYcfVa7z8CyQ"/>
+	    </availablePage>
+	    <availablePage>
+	      <emfPageIdentifier href="SysMLModelExplorerCopyPasteTestModel.notation#_4Yzc4KW-EeGN-cBhs2fFJg"/>
+	    </availablePage>
+	  </pageList>
+	  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+	    <windows>
+	      <children xsi:type="di:TabFolder">
+	        <children>
+	          <emfPageIdentifier href="SysMLModelExplorerCopyPasteTestModel.notation#_TmNkwHpOEeGpML05YPbTgg"/>
+	        </children>
+	        <children>
+	          <emfPageIdentifier href="SysMLModelExplorerCopyPasteTestModel.notation#_skVUkHphEeGr6LTFg6LEhg"/>
+	        </children>
+	        <children>
+	          <emfPageIdentifier href="SysMLModelExplorerCopyPasteTestModel.notation#_ByR8IH2bEeGYcfVa7z8CyQ"/>
+	        </children>
+	        <children>
+	          <emfPageIdentifier href="SysMLModelExplorerCopyPasteTestModel.notation#_4Yzc4KW-EeGN-cBhs2fFJg"/>
+	        </children>
+	      </children>
+	    </windows>
+	  </sashModel>
+	</di:SashWindowsMngr>
+  <architecture:ArchitectureDescription contextId="org.eclipse.papyrus.sysml.architecture.SysML"/>
+  <architecture:ArchitectureDescriptionPreferences>
+    <viewpointIds>org.eclipse.papyrus.sysml.analysis</viewpointIds>
+    <viewpointIds>org.eclipse.papyrus.sysml.design</viewpointIds>
+  </architecture:ArchitectureDescriptionPreferences>
+</xmi:XMI>
+	
\ No newline at end of file
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/META-INF/MANIFEST.MF
index b6b34adfbc2..cecd0cabbe5 100644
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,8 @@ Require-Bundle: org.junit;bundle-version="4.10.0",
  org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
  org.eclipse.papyrus.sysml.service.types;bundle-version="1.2.0",
- org.eclipse.papyrus.sysml;bundle-version="1.2.0"
+ org.eclipse.papyrus.sysml;bundle-version="1.2.0",
+ org.eclipse.papyrus.sysml.architecture;bundle-version="1.0.0"
 Export-Package: org.eclipse.papyrus.sysml.service.types.tests.suites
 Bundle-Vendor: %providerName
 Bundle-Version: 1.2.0.qualifier
diff --git a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/src/org/eclipse/papyrus/sysml/service/types/tests/registry/TestElementTypeRegistryContent.java b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/src/org/eclipse/papyrus/sysml/service/types/tests/registry/TestElementTypeRegistryContent.java
index 3723ecabe22..720c8c10929 100644
--- a/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/src/org/eclipse/papyrus/sysml/service/types/tests/registry/TestElementTypeRegistryContent.java
+++ b/tests/junit/plugins/sysml/org.eclipse.papyrus.sysml.service.types.tests/src/org/eclipse/papyrus/sysml/service/types/tests/registry/TestElementTypeRegistryContent.java
@@ -7,15 +7,17 @@ import java.util.Iterator;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.emf.type.core.ClientContextManager;
 import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
 import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.services.edit.context.TypeContext;
 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
 import org.eclipse.papyrus.infra.services.edit.service.IElementEditServiceProvider;
 import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry;
 import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
 import org.eclipse.papyrus.sysml.activities.ActivitiesPackage;
 import org.eclipse.papyrus.sysml.allocations.AllocationsPackage;
+import org.eclipse.papyrus.sysml.architecture.SysMLArchitectureContextIds;
 import org.eclipse.papyrus.sysml.blocks.BlocksPackage;
 import org.eclipse.papyrus.sysml.constraints.ConstraintsPackage;
 import org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage;
@@ -31,18 +33,22 @@ import org.junit.Test;
  *
  */
 public class TestElementTypeRegistryContent extends AbstractPapyrusTest {
-
-	private static final String PAPYRUS_CONTEXT_ID = "org.eclipse.papyrus.infra.services.edit.TypeContext"; //$NON-NLS-1$
-
+	private static IClientContext context;
+	
 	private static final String PAPYRUS_ELEMENT_TYPE_PREFIX = "org.eclipse.papyrus.sysml."; //$NON-NLS-1$
 
 	private static final String PAPYRUS_ST_APPLICATION_TYPE_PREFIX = "org.eclipse.papyrus.sysml.stereotype."; //$NON-NLS-1$
 
 	@BeforeClass
 	public static void before() {
-		ElementTypeSetConfigurationRegistry registry = ElementTypeSetConfigurationRegistry.getInstance();
-		Assert.assertNotNull("registry should not be null after init", registry);
+		Assert.assertNotNull("registry should not be null after init", ElementTypeSetConfigurationRegistry.getInstance());
 		Assert.assertNotNull("element type should not be null", SysMLElementTypes.BLOCK);
+		
+		try {
+			context = TypeContext.getContext(SysMLArchitectureContextIds.SysML);
+		} catch (ServiceException e) {
+			fail("Default client context could not be found.");
+		}
 	}
 
 
@@ -56,7 +62,7 @@ public class TestElementTypeRegistryContent extends AbstractPapyrusTest {
 			if (eObject instanceof EClass) {
 
 				EClass eClass = (EClass) eObject;
-				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider().isKnownElementType(PAPYRUS_ELEMENT_TYPE_PREFIX + eClass.getName()));
+				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider(context).isKnownElementType(PAPYRUS_ELEMENT_TYPE_PREFIX + eClass.getName()));
 			}
 		}
 	}
@@ -71,7 +77,7 @@ public class TestElementTypeRegistryContent extends AbstractPapyrusTest {
 			if (eObject instanceof EClass) {
 
 				EClass eClass = (EClass) eObject;
-				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider().isKnownElementType(PAPYRUS_ST_APPLICATION_TYPE_PREFIX + eClass.getName()));
+				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider(context).isKnownElementType(PAPYRUS_ST_APPLICATION_TYPE_PREFIX + eClass.getName()));
 			}
 		}
 	}
@@ -116,7 +122,7 @@ public class TestElementTypeRegistryContent extends AbstractPapyrusTest {
 					continue;
 				}
 
-				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider().isKnownElementType(PAPYRUS_ELEMENT_TYPE_PREFIX + eClass.getName()));
+				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider(context).isKnownElementType(PAPYRUS_ELEMENT_TYPE_PREFIX + eClass.getName()));
 			}
 		}
 	}
@@ -131,7 +137,7 @@ public class TestElementTypeRegistryContent extends AbstractPapyrusTest {
 			if (eObject instanceof EClass) {
 				EClass eClass = (EClass) eObject;
 
-				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider().isKnownElementType(PAPYRUS_ST_APPLICATION_TYPE_PREFIX + eClass.getName()));
+				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider(context).isKnownElementType(PAPYRUS_ST_APPLICATION_TYPE_PREFIX + eClass.getName()));
 			}
 		}
 	}
@@ -146,7 +152,7 @@ public class TestElementTypeRegistryContent extends AbstractPapyrusTest {
 			if (eObject instanceof EClass) {
 
 				EClass eClass = (EClass) eObject;
-				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider().isKnownElementType(PAPYRUS_ELEMENT_TYPE_PREFIX + eClass.getName()));
+				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider(context).isKnownElementType(PAPYRUS_ELEMENT_TYPE_PREFIX + eClass.getName()));
 			}
 		}
 	}
@@ -161,7 +167,7 @@ public class TestElementTypeRegistryContent extends AbstractPapyrusTest {
 			if (eObject instanceof EClass) {
 
 				EClass eClass = (EClass) eObject;
-				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider().isKnownElementType(PAPYRUS_ST_APPLICATION_TYPE_PREFIX + eClass.getName()));
+				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider(context).isKnownElementType(PAPYRUS_ST_APPLICATION_TYPE_PREFIX + eClass.getName()));
 			}
 		}
 	}
@@ -176,7 +182,7 @@ public class TestElementTypeRegistryContent extends AbstractPapyrusTest {
 			if (eObject instanceof EClass) {
 
 				EClass eClass = (EClass) eObject;
-				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider().isKnownElementType(PAPYRUS_ST_APPLICATION_TYPE_PREFIX + eClass.getName()));
+				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider(context).isKnownElementType(PAPYRUS_ST_APPLICATION_TYPE_PREFIX + eClass.getName()));
 			}
 		}
 	}
@@ -201,7 +207,7 @@ public class TestElementTypeRegistryContent extends AbstractPapyrusTest {
 					continue;
 				}
 
-				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider().isKnownElementType(PAPYRUS_ELEMENT_TYPE_PREFIX + eClass.getName()));
+				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider(context).isKnownElementType(PAPYRUS_ELEMENT_TYPE_PREFIX + eClass.getName()));
 			}
 		}
 	}
@@ -216,7 +222,7 @@ public class TestElementTypeRegistryContent extends AbstractPapyrusTest {
 			if (eObject instanceof EClass) {
 				EClass eClass = (EClass) eObject;
 
-				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider().isKnownElementType(PAPYRUS_ST_APPLICATION_TYPE_PREFIX + eClass.getName()));
+				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider(context).isKnownElementType(PAPYRUS_ST_APPLICATION_TYPE_PREFIX + eClass.getName()));
 			}
 		}
 	}
@@ -241,7 +247,7 @@ public class TestElementTypeRegistryContent extends AbstractPapyrusTest {
 					continue;
 				}
 
-				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider().isKnownElementType(PAPYRUS_ELEMENT_TYPE_PREFIX + eClass.getName()));
+				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider(context).isKnownElementType(PAPYRUS_ELEMENT_TYPE_PREFIX + eClass.getName()));
 			}
 		}
 	}
@@ -256,7 +262,7 @@ public class TestElementTypeRegistryContent extends AbstractPapyrusTest {
 			if (eObject instanceof EClass) {
 				EClass eClass = (EClass) eObject;
 
-				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider().isKnownElementType(PAPYRUS_ST_APPLICATION_TYPE_PREFIX + eClass.getName()));
+				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider(context).isKnownElementType(PAPYRUS_ST_APPLICATION_TYPE_PREFIX + eClass.getName()));
 			}
 		}
 	}
@@ -271,7 +277,7 @@ public class TestElementTypeRegistryContent extends AbstractPapyrusTest {
 			if (eObject instanceof EClass) {
 
 				EClass eClass = (EClass) eObject;
-				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider().isKnownElementType(PAPYRUS_ELEMENT_TYPE_PREFIX + eClass.getName()));
+				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider(context).isKnownElementType(PAPYRUS_ELEMENT_TYPE_PREFIX + eClass.getName()));
 			}
 		}
 	}
@@ -286,7 +292,7 @@ public class TestElementTypeRegistryContent extends AbstractPapyrusTest {
 			if (eObject instanceof EClass) {
 
 				EClass eClass = (EClass) eObject;
-				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider().isKnownElementType(PAPYRUS_ST_APPLICATION_TYPE_PREFIX + eClass.getName()));
+				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider(context).isKnownElementType(PAPYRUS_ST_APPLICATION_TYPE_PREFIX + eClass.getName()));
 			}
 		}
 	}
@@ -294,12 +300,7 @@ public class TestElementTypeRegistryContent extends AbstractPapyrusTest {
 	@Test
 	public void testRegistryContentForSysMLAssociations() {
 
-		IClientContext context = ClientContextManager.getInstance().getClientContext(PAPYRUS_CONTEXT_ID);
-		if (context == null) {
-			fail("Papyrus IClientContext could not be found.");
-		}
-
-		IElementEditServiceProvider service = ElementEditServiceUtils.getEditServiceProvider();
+		IElementEditServiceProvider service = ElementEditServiceUtils.getEditServiceProvider(context);
 
 		assertTrue("No ISpecializationType found for SysML Association in Papyrus context", service.isKnownElementType("org.eclipse.papyrus.sysml.Association"));
 
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/AbstractTestPinDerivation.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/AbstractTestPinDerivation.java
index f7e6685d5cd..573c5eb500d 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/AbstractTestPinDerivation.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity.tests/src/org/eclipse/papyrus/uml/diagram/activity/tests/derivation/pins/AbstractTestPinDerivation.java
@@ -1,146 +1,158 @@
-/*****************************************************************************

- * Copyright (c) 2016 CEA LIST and others.

- * 

- * 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:

- *   Jérémie TATIBOUET (CEA LIST) - Initial API and implementation

- *   

- *****************************************************************************/

-

-package org.eclipse.papyrus.uml.diagram.activity.tests.derivation.pins;

-

-import java.util.HashMap;

-import java.util.Iterator;

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.transaction.TransactionalEditingDomain;

-import org.eclipse.emf.transaction.impl.TransactionalEditingDomainImpl;

-import org.eclipse.papyrus.infra.core.resource.ModelSet;

-import org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration;

-import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration;

-import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry;

-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;

-import org.eclipse.uml2.uml.Model;

-import org.eclipse.uml2.uml.UMLFactory;

-import org.eclipse.uml2.uml.PrimitiveType;

-import org.junit.Assert;

-import org.junit.BeforeClass;

-

-public abstract class AbstractTestPinDerivation extends AbstractPapyrusTest {

-

-	protected static final String TYPE_CONTEXT = "org.eclipse.papyrus.infra.services.edit.TypeContext";

-

-	protected static final String UML_PRIMITIVE_TYPES_PATH = "platform:/plugin/org.eclipse.uml2.uml.resources/libraries/UMLPrimitiveTypes.library.uml";

-

-	/**

-	 * Model set used to register any resource used during tests execution

-	 */

-	protected ModelSet modelSet;

-

-	/**

-	 * UML model used in the different test cases

-	 */

-	protected Model umlTestModel;

-

-	/**

-	 * Mock editing domain

-	 */

-	protected TransactionalEditingDomain editingDomain;

-

-	/**

-	 * Map referencing primitive types (key is the primitive type name)

-	 */

-	private Map<String, PrimitiveType> primtiveTypesMap;

-

-	/**

-	 * Constructor.

-	 */

-	public AbstractTestPinDerivation() {

-		this.modelSet = new ModelSet();

-		this.umlTestModel = UMLFactory.eINSTANCE.createModel();

-		this.primtiveTypesMap = new HashMap<String, PrimitiveType>();

-	}

-

-	/**

-	 * Retrieve the advice identified by the provided identifier

-	 * 

-	 * @param adviceIdentifier

-	 *            identifier of the searched advice

-	 * @return the advice or null

-	 */

-	protected AbstractAdviceBindingConfiguration getAdvice(final String adviceIdentifier) {

-		ElementTypeSetConfiguration elementTypeSet = this.getActivityDiagramElementTypeConfiguration();

-		List<AbstractAdviceBindingConfiguration> adviceBindings = elementTypeSet.getAdviceBindingsConfigurations();

-		Iterator<AbstractAdviceBindingConfiguration> adviceBindingIterator = adviceBindings.listIterator();

-		AbstractAdviceBindingConfiguration advice = null;

-		while (advice == null && adviceBindingIterator.hasNext()) {

-			AbstractAdviceBindingConfiguration currentAdvice = adviceBindingIterator.next();

-			if (currentAdvice.getIdentifier().equals(adviceIdentifier)) {

-				advice = currentAdvice;

-			}

-		}

-		return advice;

-	}

-

-	/**

-	 * Retrieve element type set declared for the activity diagram.

-	 * 

-	 * @return the element type set

-	 */

-	protected ElementTypeSetConfiguration getActivityDiagramElementTypeConfiguration() {

-		ElementTypeSetConfigurationRegistry instance = ElementTypeSetConfigurationRegistry.getInstance();

-		Map<String, Map<String, ElementTypeSetConfiguration>> elementTypeSetConfigurations = instance.getElementTypeSetConfigurations();

-		Map<String, ElementTypeSetConfiguration> map = elementTypeSetConfigurations.get(TYPE_CONTEXT);

-		return map.get("org.eclipse.papyrus.uml.diagram.activity.elementTypeSet");

-	}

-

-	/**

-	 * Force loading of declared element type configurations

-	 */

-	@BeforeClass

-	public static void loadActvityDiagramElementTypes() {

-		ElementTypeSetConfigurationRegistry instance = ElementTypeSetConfigurationRegistry.getInstance();

-		Map<String, Map<String, ElementTypeSetConfiguration>> elementTypeSetConfigurations = instance.getElementTypeSetConfigurations();

-		Map<String, ElementTypeSetConfiguration> map = elementTypeSetConfigurations.get(TYPE_CONTEXT);

-		ElementTypeSetConfiguration elementTypeSetConfiguration = map.get("org.eclipse.papyrus.uml.diagram.activity.elementTypeSet");

-		Assert.assertNotNull("The element types set definition for activity model could not be found", elementTypeSetConfiguration);

-	}

-

-	/**

-	 * Convenience method to easily access a primitive type in sub-classes

-	 * 

-	 * @param primitiveTypeName

-	 *            the name of the primitive type

-	 * @return the primitive type

-	 */

-	public PrimitiveType getPrimitiveType(final String primitiveTypeName) {

-		return this.primtiveTypesMap.get(primitiveTypeName);

-	}

-

-	/**

-	 * Build a model set with only primitive types model loaded. This method is intended to be overridden by sub-classes.

-	 */

-	public void populateBaseTestModel() {

-		Resource primitiveTypesResource = this.modelSet.getResource(URI.createURI(UML_PRIMITIVE_TYPES_PATH), true);

-		if (primitiveTypesResource == null) {

-			Assert.fail("UML primitive types could not be loaded within the model set");

-		} else {

-			this.editingDomain = new TransactionalEditingDomainImpl(null, this.modelSet);

-			Iterator<EObject> contentIterator = primitiveTypesResource.getAllContents();

-			while (contentIterator.hasNext()) {

-				EObject modelElement = contentIterator.next();

-				if (modelElement instanceof PrimitiveType) {

-					this.primtiveTypesMap.put(((PrimitiveType) modelElement).getName(), (PrimitiveType) modelElement);

-				}

-			}

-		}

-	}

-}

+/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST and others.
+ * 
+ * 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:
+ *   J�r�mie TATIBOUET (CEA LIST) - Initial API and implementation
+ *   
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.activity.tests.derivation.pins;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.emf.transaction.impl.TransactionalEditingDomainImpl;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.services.edit.context.TypeContext;
+import org.eclipse.papyrus.infra.types.AbstractAdviceBindingConfiguration;
+import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration;
+import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry;
+import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.uml2.uml.Model;
+import org.eclipse.uml2.uml.UMLFactory;
+import org.eclipse.uml2.uml.PrimitiveType;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+
+public abstract class AbstractTestPinDerivation extends AbstractPapyrusTest {
+
+	protected static final String UML_PRIMITIVE_TYPES_PATH = "platform:/plugin/org.eclipse.uml2.uml.resources/libraries/UMLPrimitiveTypes.library.uml";
+
+	/**
+	 * Model set used to register any resource used during tests execution
+	 */
+	protected ModelSet modelSet;
+
+	/**
+	 * UML model used in the different test cases
+	 */
+	protected Model umlTestModel;
+
+	/**
+	 * Mock editing domain
+	 */
+	protected TransactionalEditingDomain editingDomain;
+
+	/**
+	 * Map referencing primitive types (key is the primitive type name)
+	 */
+	private Map<String, PrimitiveType> primtiveTypesMap;
+
+	/**
+	 * Constructor.
+	 */
+	public AbstractTestPinDerivation() {
+		this.modelSet = new ModelSet();
+		this.umlTestModel = UMLFactory.eINSTANCE.createModel();
+		this.primtiveTypesMap = new HashMap<String, PrimitiveType>();
+	}
+
+	/**
+	 * Retrieve the advice identified by the provided identifier
+	 * 
+	 * @param adviceIdentifier
+	 *            identifier of the searched advice
+	 * @return the advice or null
+	 */
+	protected AbstractAdviceBindingConfiguration getAdvice(final String adviceIdentifier) {
+		ElementTypeSetConfiguration elementTypeSet = this.getActivityDiagramElementTypeConfiguration();
+		List<AbstractAdviceBindingConfiguration> adviceBindings = elementTypeSet.getAdviceBindingsConfigurations();
+		Iterator<AbstractAdviceBindingConfiguration> adviceBindingIterator = adviceBindings.listIterator();
+		AbstractAdviceBindingConfiguration advice = null;
+		while (advice == null && adviceBindingIterator.hasNext()) {
+			AbstractAdviceBindingConfiguration currentAdvice = adviceBindingIterator.next();
+			if (currentAdvice.getIdentifier().equals(adviceIdentifier)) {
+				advice = currentAdvice;
+			}
+		}
+		return advice;
+	}
+
+	/**
+	 * Retrieve element type set declared for the activity diagram.
+	 * 
+	 * @return the element type set
+	 */
+	protected ElementTypeSetConfiguration getActivityDiagramElementTypeConfiguration() {
+		String clientContextId = "";
+		try {
+			clientContextId = TypeContext.getDefaultContext().getId();
+		} catch (ServiceException e) {
+			Assert.fail("Default client context cannot be found");
+		}
+		ElementTypeSetConfigurationRegistry instance = ElementTypeSetConfigurationRegistry.getInstance();
+		Map<String, Map<String, ElementTypeSetConfiguration>> elementTypeSetConfigurations = instance.getElementTypeSetConfigurations();
+		Map<String, ElementTypeSetConfiguration> map = elementTypeSetConfigurations.get(clientContextId);
+		return map.get("org.eclipse.papyrus.uml.diagram.activity.elementTypeSet");
+	}
+
+	/**
+	 * Force loading of declared element type configurations
+	 */
+	@BeforeClass
+	public static void loadActvityDiagramElementTypes() {
+		String clientContextId = "";
+		try {
+			clientContextId = TypeContext.getDefaultContext().getId();
+		} catch (ServiceException e) {
+			Assert.fail("Default client context cannot be found");
+		}
+		ElementTypeSetConfigurationRegistry instance = ElementTypeSetConfigurationRegistry.getInstance();
+		Map<String, Map<String, ElementTypeSetConfiguration>> elementTypeSetConfigurations = instance.getElementTypeSetConfigurations();
+		Map<String, ElementTypeSetConfiguration> map = elementTypeSetConfigurations.get(clientContextId);
+		ElementTypeSetConfiguration elementTypeSetConfiguration = map.get("org.eclipse.papyrus.uml.diagram.activity.elementTypeSet");
+		Assert.assertNotNull("The element types set definition for activity model could not be found", elementTypeSetConfiguration);
+	}
+
+	/**
+	 * Convenience method to easily access a primitive type in sub-classes
+	 * 
+	 * @param primitiveTypeName
+	 *            the name of the primitive type
+	 * @return the primitive type
+	 */
+	public PrimitiveType getPrimitiveType(final String primitiveTypeName) {
+		return this.primtiveTypesMap.get(primitiveTypeName);
+	}
+
+	/**
+	 * Build a model set with only primitive types model loaded. This method is intended to be overridden by sub-classes.
+	 */
+	public void populateBaseTestModel() {
+		Resource primitiveTypesResource = this.modelSet.getResource(URI.createURI(UML_PRIMITIVE_TYPES_PATH), true);
+		if (primitiveTypesResource == null) {
+			Assert.fail("UML primitive types could not be loaded within the model set");
+		} else {
+			this.editingDomain = new TransactionalEditingDomainImpl(null, this.modelSet);
+			Iterator<EObject> contentIterator = primitiveTypesResource.getAllContents();
+			while (contentIterator.hasNext()) {
+				EObject modelElement = contentIterator.next();
+				if (modelElement instanceof PrimitiveType) {
+					this.primtiveTypesMap.put(((PrimitiveType) modelElement).getName(), (PrimitiveType) modelElement);
+				}
+			}
+		}
+	}
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/META-INF/MANIFEST.MF
index 5963ae314d4..d7eabdf6d49 100755
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz.tests/META-INF/MANIFEST.MF
@@ -1,44 +1,44 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

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

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

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

- org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",

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

- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",

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

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

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

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

- org.junit;bundle-version="4.10.0",

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

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

- org.eclipse.emf.common.ui;bundle-version="2.9.0",

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

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

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

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

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

- org.eclipse.core.expressions,

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

- org.eclipse.xtend.lib;bundle-version="2.8.3",

- com.google.guava;bundle-version="11.0.0",

- org.eclipse.xtext.xbase.lib;bundle-version="2.8.3",

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

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

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

-Export-Package: org.eclipse.papyrus.uml.diagram.clazz.test,

- org.eclipse.papyrus.uml.diagram.clazz.test.canonical,

- org.eclipse.papyrus.uml.diagram.clazz.test.load,

- org.eclipse.papyrus.uml.diagram.clazz.tests.generation

-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.uml.diagram.clazz.test.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.clazz.tests

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
+ org.eclipse.papyrus.editor;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.2.0",
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.2.0",
+ org.eclipse.uml2.uml;bundle-version="4.0.0",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
+ org.eclipse.ui.ide;bundle-version="3.10.0",
+ org.eclipse.emf.common.ui;bundle-version="2.9.0",
+ org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.services.openelement;bundle-version="1.2.0",
+ org.eclipse.core.expressions,
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.2.0",
+ org.eclipse.xtend.lib;bundle-version="2.8.3",
+ com.google.guava;bundle-version="11.0.0",
+ org.eclipse.xtext.xbase.lib;bundle-version="2.8.3",
+ org.eclipse.papyrus.tests.framework;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="1.2.0"
+Export-Package: org.eclipse.papyrus.uml.diagram.clazz.test,
+ org.eclipse.papyrus.uml.diagram.clazz.test.canonical,
+ org.eclipse.papyrus.uml.diagram.clazz.test.load,
+ org.eclipse.papyrus.uml.diagram.clazz.tests.generation
+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.uml.diagram.clazz.test.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.clazz.tests
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/org.eclipse.papyrus.uml.diagram.interactionoverview.tests.launch b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/org.eclipse.papyrus.uml.diagram.interactionoverview.tests.launch
index ad6a6f75b71..9972955125a 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/org.eclipse.papyrus.uml.diagram.interactionoverview.tests.launch
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/org.eclipse.papyrus.uml.diagram.interactionoverview.tests.launch
@@ -1,46 +1,49 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">

-<booleanAttribute key="append.args" value="true"/>

-<booleanAttribute key="askclear" value="false"/>

-<booleanAttribute key="automaticAdd" value="true"/>

-<booleanAttribute key="automaticValidate" value="false"/>

-<stringAttribute key="bootstrap" value=""/>

-<stringAttribute key="checked" value="[NONE]"/>

-<booleanAttribute key="clearConfig" value="true"/>

-<booleanAttribute key="clearws" value="true"/>

-<booleanAttribute key="clearwslog" value="false"/>

-<listAttribute key="com.mountainminds.eclemma.core.SCOPE_IDS">

-<listEntry value="=org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen"/>

-<listEntry value="=org.eclipse.papyrus.uml.diagram.interactionoverview/src"/>

-</listAttribute>

-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>

-<booleanAttribute key="default" value="true"/>

-<booleanAttribute key="includeOptional" value="true"/>

-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

-<listEntry value="/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/src/org/eclipse/papyrus/uml/diagram/interactionoverview/tests/AllTests.java"/>

-</listAttribute>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

-<listEntry value="1"/>

-</listAttribute>

-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>

-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>

-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>

-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>

-<stringAttribute key="org.eclipse.jdt.launching.JAVA_COMMAND" value="java"/>

-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.uml.diagram.interactionoverview.tests.AllTests"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.uml.diagram.interactionoverview.tests"/>

-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea -XX:PermSize=512M -XX:MaxPermSize=512M  -Xms40m -Xmx1024m&#13;&#10;-XX:+CMSClassUnloadingEnabled"/>

-<stringAttribute key="pde.version" value="3.3"/>

-<stringAttribute key="product" value="org.eclipse.platform.ide"/>

-<booleanAttribute key="run_in_ui_thread" value="true"/>

-<booleanAttribute key="show_selected_only" value="false"/>

-<booleanAttribute key="tracing" value="false"/>

-<booleanAttribute key="useCustomFeatures" value="false"/>

-<booleanAttribute key="useDefaultConfig" value="true"/>

-<booleanAttribute key="useDefaultConfigArea" value="false"/>

-<booleanAttribute key="useProduct" value="true"/>

-</launchConfiguration>

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<listAttribute key="com.mountainminds.eclemma.core.SCOPE_IDS">
+<listEntry value="=org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen"/>
+<listEntry value="=org.eclipse.papyrus.uml.diagram.interactionoverview/src"/>
+</listAttribute>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="false"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.papyrus.uml.diagram.interactionoverview.tests/src/org/eclipse/papyrus/uml/diagram/interactionoverview/tests/AllTests.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.JAVA_COMMAND" value="java"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.uml.diagram.interactionoverview.tests.AllTests"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.uml.diagram.interactionoverview.tests"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea -XX:PermSize=512M -XX:MaxPermSize=512M  -Xms40m -Xmx1024m&#13;&#10;-XX:+CMSClassUnloadingEnabled"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.platform.ide"/>
+<booleanAttribute key="run_in_ui_thread" value="true"/>
+<stringAttribute key="selected_target_plugins" value="ca.odell.glazedlists@default:default,ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.google.gerrit.common@default:default,com.google.gerrit.prettify@default:default,com.google.gerrit.reviewdb@default:default,com.google.gson@default:default,com.google.guava@default:default,com.google.gwt.servlet@default:default,com.google.gwtjsonrpc@default:default,com.google.gwtorm@default:default,com.google.inject.multibindings@default:false,com.google.inject@default:default,com.gradleware.tooling.client@default:default,com.gradleware.tooling.model@default:default,com.gradleware.tooling.utils@default:default,com.ibm.icu@default:default,com.jcraft.jsch@default:default,com.sun.el@default:default,fr.obeo.releng.targetplatform.ui@default:default,fr.obeo.releng.targetplatform@default:default,javaewah@default:default,javax.annotation@default:default,javax.el@default:default,javax.inject@default:default,javax.servlet*3.0.0.v201112011016@default:default,javax.servlet*3.1.0.v201410161800@default:default,javax.servlet.jsp@default:default,javax.xml@default:default,lpg.runtime.java@default:default,net.sourceforge.nattable.core@default:default,org.antlr.runtime*3.2.0.v201101311130@default:default,org.antlr.runtime*4.3.0.v201502022030@default:default,org.apache.ant@default:default,org.apache.batik.bridge@default:default,org.apache.batik.css*1.6.0.v201011041432@default:default,org.apache.batik.css*1.7.0.v201011041433@default:default,org.apache.batik.dom.svg@default:default,org.apache.batik.dom@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.parser@default:default,org.apache.batik.pdf@default:default,org.apache.batik.svggen@default:default,org.apache.batik.transcoder@default:default,org.apache.batik.util*1.6.0.v201011041432@default:default,org.apache.batik.util*1.7.0.v201011041433@default:default,org.apache.batik.util.gui*1.6.0.v201011041432@default:default,org.apache.batik.util.gui*1.7.0.v200903091627@default:default,org.apache.batik.xml@default:default,org.apache.commons.cli@default:default,org.apache.commons.codec@default:default,org.apache.commons.compress@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.io@default:default,org.apache.commons.jxpath*1.2.0.v20080604-1500@default:default,org.apache.commons.jxpath*1.3.0.v200911051830@default:default,org.apache.commons.lang3@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.commons.math@default:default,org.apache.commons.pool@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.httpcomponents.httpclient*4.3.6.v201411290715@default:default,org.apache.httpcomponents.httpclient*4.3.6.v201511171540@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.jasper.glassfish@default:default,org.apache.log4j@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.apache.solr.client.solrj@default:default,org.apache.ws.commons.util@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.apache.xmlrpc@default:default,org.eclipse.acceleo.annotations@default:default,org.eclipse.acceleo.common.ide@default:default,org.eclipse.acceleo.common.ui@default:default,org.eclipse.acceleo.common@default:default,org.eclipse.acceleo.engine@default:default,org.eclipse.acceleo.ide.ui@default:default,org.eclipse.acceleo.model@default:default,org.eclipse.acceleo.parser@default:default,org.eclipse.acceleo.profiler@default:default,org.eclipse.acceleo.query@default:default,org.eclipse.acceleo.traceability.model@default:default,org.eclipse.acceleo.traceability@default:default,org.eclipse.acceleo.ui.interpreter@default:default,org.eclipse.aether.api@default:default,org.eclipse.aether.connector.basic@default:default,org.eclipse.aether.impl@default:default,org.eclipse.aether.maven@default:default,org.eclipse.aether.spi@default:default,org.eclipse.aether.transport.file@default:default,org.eclipse.aether.transport.http@default:default,org.eclipse.aether.util@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.b3.aggregator.edit@default:default,org.eclipse.b3.aggregator.editor@default:default,org.eclipse.b3.aggregator.engine.maven@default:default,org.eclipse.b3.aggregator.engine@default:default,org.eclipse.b3.aggregator.legacy.ui@default:default,org.eclipse.b3.aggregator.legacy@default:default,org.eclipse.b3.aggregator@default:default,org.eclipse.b3.cli@default:default,org.eclipse.b3.p2.edit@default:default,org.eclipse.b3.p2.maven.indexer@default:default,org.eclipse.b3.p2.maven@default:default,org.eclipse.b3.p2@default:default,org.eclipse.b3.util@default:default,org.eclipse.buckminster.osgi.filter@default:default,org.eclipse.buildship.branding@default:default,org.eclipse.buildship.core@default:default,org.eclipse.buildship.stsmigration@default:default,org.eclipse.buildship.ui@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.cvs@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.draw2d.doc.isv@default:default,org.eclipse.draw2d@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.emf.xpath@default:default,org.eclipse.e4.tools.compat@default:default,org.eclipse.e4.tools.emf.editor3x@default:default,org.eclipse.e4.tools.emf.ui@default:default,org.eclipse.e4.tools.jdt.templates@default:default,org.eclipse.e4.tools.services@default:default,org.eclipse.e4.tools@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.dialogs@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt.cocoa@default:false,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.httpclient4.ssl@default:false,org.eclipse.ecf.provider.filetransfer.httpclient4@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.eef.common.ui@default:default,org.eclipse.eef.common@default:default,org.eclipse.eef.core.ext.widgets.reference@default:default,org.eclipse.eef.core@default:default,org.eclipse.eef.ext.widgets.reference@default:default,org.eclipse.eef.ide.ui.ext.widgets.reference@default:default,org.eclipse.eef.ide.ui.properties@default:default,org.eclipse.eef.ide.ui@default:default,org.eclipse.eef.ide@default:default,org.eclipse.eef.properties.ui.legacy@default:default,org.eclipse.eef.properties.ui@default:default,org.eclipse.eef@default:default,org.eclipse.egit.core@default:default,org.eclipse.egit.doc@default:default,org.eclipse.egit.mylyn.ui@default:default,org.eclipse.egit.ui@default:default,org.eclipse.egit@default:default,org.eclipse.emf.ant@default:default,org.eclipse.emf.cdo.admin@default:default,org.eclipse.emf.cdo.common.db@default:default,org.eclipse.emf.cdo.common@default:default,org.eclipse.emf.cdo.compare@default:default,org.eclipse.emf.cdo.defs@default:default,org.eclipse.emf.cdo.doc@default:default,org.eclipse.emf.cdo.ecore.retrofit@default:false,org.eclipse.emf.cdo.edit@default:default,org.eclipse.emf.cdo.examples.installer@default:default,org.eclipse.emf.cdo.explorer.ui@default:default,org.eclipse.emf.cdo.explorer@default:default,org.eclipse.emf.cdo.expressions.edit@default:default,org.eclipse.emf.cdo.expressions.editor@default:default,org.eclipse.emf.cdo.expressions@default:default,org.eclipse.emf.cdo.migrator@default:default,org.eclipse.emf.cdo.net4j@default:default,org.eclipse.emf.cdo.sdk@default:default,org.eclipse.emf.cdo.security.edit@default:default,org.eclipse.emf.cdo.security.editor@default:default,org.eclipse.emf.cdo.security.ui@default:default,org.eclipse.emf.cdo.security@default:default,org.eclipse.emf.cdo.server.admin@default:default,org.eclipse.emf.cdo.server.db@default:default,org.eclipse.emf.cdo.server.lissome@default:default,org.eclipse.emf.cdo.server.mongodb@default:default,org.eclipse.emf.cdo.server.net4j@default:default,org.eclipse.emf.cdo.server.ocl@default:default,org.eclipse.emf.cdo.server.product@default:default,org.eclipse.emf.cdo.server.security@default:default,org.eclipse.emf.cdo.server@default:default,org.eclipse.emf.cdo.transfer.repository@default:default,org.eclipse.emf.cdo.transfer.ui@default:default,org.eclipse.emf.cdo.transfer.workspace.ui@default:default,org.eclipse.emf.cdo.transfer.workspace@default:default,org.eclipse.emf.cdo.transfer@default:default,org.eclipse.emf.cdo.ui.admin@default:default,org.eclipse.emf.cdo.ui.compare@default:default,org.eclipse.emf.cdo.ui.defs@default:default,org.eclipse.emf.cdo.ui.shared@default:default,org.eclipse.emf.cdo.ui.team@default:default,org.eclipse.emf.cdo.ui@default:default,org.eclipse.emf.cdo.workspace@default:default,org.eclipse.emf.cdo@default:default,org.eclipse.emf.cheatsheets@default:default,org.eclipse.emf.codegen.ecore.ui@default:default,org.eclipse.emf.codegen.ecore.xtext@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.codegen.ui@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.compare.diagram.edit@default:default,org.eclipse.emf.compare.diagram.ide.ui.papyrus@default:default,org.eclipse.emf.compare.diagram.ide.ui@default:default,org.eclipse.emf.compare.diagram.papyrus@default:default,org.eclipse.emf.compare.diagram@default:default,org.eclipse.emf.compare.doc@default:default,org.eclipse.emf.compare.edit@default:default,org.eclipse.emf.compare.egit.ui@default:default,org.eclipse.emf.compare.egit@default:default,org.eclipse.emf.compare.ide.ui@default:default,org.eclipse.emf.compare.ide@default:default,org.eclipse.emf.compare.rcp.ui@default:default,org.eclipse.emf.compare.rcp@default:default,org.eclipse.emf.compare.uml2.edit.papyrus@default:default,org.eclipse.emf.compare.uml2.edit@default:default,org.eclipse.emf.compare.uml2.rcp.ui@default:default,org.eclipse.emf.compare.uml2.rcp@default:default,org.eclipse.emf.compare.uml2@default:default,org.eclipse.emf.compare@default:default,org.eclipse.emf.converter@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.doc@default:default,org.eclipse.emf.ecore.change.edit@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.emf.ecore.xcore.lib@default:default,org.eclipse.emf.ecore.xcore@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.eef.runtime@default:default,org.eclipse.emf.example.installer@default:default,org.eclipse.emf.examples.library@default:default,org.eclipse.emf.exporter@default:default,org.eclipse.emf.facet.aggregate.doc@default:default,org.eclipse.emf.facet.aggregate.metamodel.notgenerated@default:default,org.eclipse.emf.facet.aggregate.metamodel@default:default,org.eclipse.emf.facet.aggregate.tests@default:default,org.eclipse.emf.facet.capabilities@default:default,org.eclipse.emf.facet.common.core@default:default,org.eclipse.emf.facet.common.sdk.core@default:default,org.eclipse.emf.facet.common.sdk.ui@default:default,org.eclipse.emf.facet.common.ui@default:default,org.eclipse.emf.facet.custom.core.tests@default:default,org.eclipse.emf.facet.custom.core@default:default,org.eclipse.emf.facet.custom.doc@default:default,org.eclipse.emf.facet.custom.metamodel.edit@default:default,org.eclipse.emf.facet.custom.metamodel.editor@default:default,org.eclipse.emf.facet.custom.metamodel@default:default,org.eclipse.emf.facet.custom.sdk.core@default:default,org.eclipse.emf.facet.custom.sdk.tests@default:default,org.eclipse.emf.facet.custom.sdk.ui@default:default,org.eclipse.emf.facet.custom.tests.metamodel@default:default,org.eclipse.emf.facet.custom.tests@default:default,org.eclipse.emf.facet.custom.ui@default:default,org.eclipse.emf.facet.dev.core@default:default,org.eclipse.emf.facet.dev.ui@default:default,org.eclipse.emf.facet.doc.api.report@default:default,org.eclipse.emf.facet.doc.metric.report@default:default,org.eclipse.emf.facet.doc.test.report@default:default,org.eclipse.emf.facet.doc@default:default,org.eclipse.emf.facet.ecore.ui@default:default,org.eclipse.emf.facet.ecore@default:default,org.eclipse.emf.facet.efacet.core@default:default,org.eclipse.emf.facet.efacet.doc@default:default,org.eclipse.emf.facet.efacet.edit.core@default:default,org.eclipse.emf.facet.efacet.edit.ui@default:default,org.eclipse.emf.facet.efacet.examples.library.core@default:default,org.eclipse.emf.facet.efacet.examples.library.metamodel.edit@default:default,org.eclipse.emf.facet.efacet.examples.library.metamodel@default:default,org.eclipse.emf.facet.efacet.metamodel.edit@default:default,org.eclipse.emf.facet.efacet.metamodel.editor@default:default,org.eclipse.emf.facet.efacet.metamodel@default:default,org.eclipse.emf.facet.efacet.sdk.ui@default:default,org.eclipse.emf.facet.efacet.tests.metamodel@default:default,org.eclipse.emf.facet.efacet.tests@default:default,org.eclipse.emf.facet.efacet.ui@default:default,org.eclipse.emf.facet.query.java.core@default:default,org.eclipse.emf.facet.query.java.metamodel@default:default,org.eclipse.emf.facet.query.java.sdk.ui@default:default,org.eclipse.emf.facet.query.java.tests@default:default,org.eclipse.emf.facet.query.java.ui.tests@default:default,org.eclipse.emf.facet.query.java.ui@default:default,org.eclipse.emf.facet.query.ocl.core@default:default,org.eclipse.emf.facet.query.ocl.metamodel@default:default,org.eclipse.emf.facet.query.ocl.sdk.ui@default:default,org.eclipse.emf.facet.tests@default:default,org.eclipse.emf.facet.util.core.tests@default:default,org.eclipse.emf.facet.util.core@default:default,org.eclipse.emf.facet.util.efacet.ocl.core@default:default,org.eclipse.emf.facet.util.emf.catalog.metamodel@default:default,org.eclipse.emf.facet.util.emf.catalog@default:default,org.eclipse.emf.facet.util.emf.core.tests@default:default,org.eclipse.emf.facet.util.emf.core@default:default,org.eclipse.emf.facet.util.emf.doc@default:default,org.eclipse.emf.facet.util.emf.ui.tests@default:default,org.eclipse.emf.facet.util.emf.ui@default:default,org.eclipse.emf.facet.util.jface.ui@default:default,org.eclipse.emf.facet.util.junit.core@default:default,org.eclipse.emf.facet.util.pde.core@default:default,org.eclipse.emf.facet.util.swt@default:default,org.eclipse.emf.facet.util.tests.swtbot@default:default,org.eclipse.emf.facet.util.ui@default:default,org.eclipse.emf.facet.widgets.celleditors.ecore.tests.samplemm@default:default,org.eclipse.emf.facet.widgets.celleditors.ecore@default:default,org.eclipse.emf.facet.widgets.celleditors.edit@default:default,org.eclipse.emf.facet.widgets.celleditors.editor@default:default,org.eclipse.emf.facet.widgets.celleditors@default:default,org.eclipse.emf.facet.widgets.table.doc@default:default,org.eclipse.emf.facet.widgets.table.examples.library.core@default:default,org.eclipse.emf.facet.widgets.table.metamodel.edit@default:default,org.eclipse.emf.facet.widgets.table.metamodel@default:default,org.eclipse.emf.facet.widgets.table.tests@default:default,org.eclipse.emf.facet.widgets.table.ui.nattable@default:default,org.eclipse.emf.facet.widgets.table.ui.workbench@default:default,org.eclipse.emf.facet.widgets.table.ui@default:default,org.eclipse.emf.facet.widgets@default:default,org.eclipse.emf.importer.ecore@default:default,org.eclipse.emf.importer.java@default:default,org.eclipse.emf.importer.rose@default:default,org.eclipse.emf.importer@default:default,org.eclipse.emf.mapping.ecore.editor@default:default,org.eclipse.emf.mapping.ecore2ecore.editor@default:default,org.eclipse.emf.mapping.ecore2ecore@default:default,org.eclipse.emf.mapping.ecore2xml.ui@default:default,org.eclipse.emf.mapping.ecore2xml@default:default,org.eclipse.emf.mapping.ecore@default:default,org.eclipse.emf.mapping.ui@default:default,org.eclipse.emf.mapping@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.emf.mwe2.language.ui@default:default,org.eclipse.emf.mwe2.language@default:default,org.eclipse.emf.mwe2.launch.ui@default:default,org.eclipse.emf.mwe2.launch@default:default,org.eclipse.emf.mwe2.lib@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.emf.query.doc@default:default,org.eclipse.emf.query.examples@default:default,org.eclipse.emf.query.ocl@default:default,org.eclipse.emf.query@default:default,org.eclipse.emf.transaction.doc@default:default,org.eclipse.emf.transaction.examples@default:default,org.eclipse.emf.transaction.ui@default:default,org.eclipse.emf.transaction@default:default,org.eclipse.emf.validation.doc@default:default,org.eclipse.emf.validation.examples@default:default,org.eclipse.emf.validation.ocl@default:default,org.eclipse.emf.validation.ui.ide@default:default,org.eclipse.emf.validation.ui@default:default,org.eclipse.emf.validation@default:default,org.eclipse.emf.workspace.doc@default:default,org.eclipse.emf.workspace.ui@default:default,org.eclipse.emf.workspace@default:default,org.eclipse.emf@default:default,org.eclipse.epp.logging.aeri.core@default:default,org.eclipse.epp.logging.aeri.ide@default:default,org.eclipse.epp.mpc.core@default:default,org.eclipse.epp.mpc.help.ui@default:default,org.eclipse.epp.mpc.ui@default:default,org.eclipse.epp.package.committers@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.equinox.launcher.cocoa.macosx.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.equinox.p2.discovery.compatibility@default:default,org.eclipse.equinox.p2.discovery@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,org.eclipse.equinox.p2.ui.discovery@default:default,org.eclipse.equinox.p2.ui.importexport@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.macosx@default:false,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.gef.doc.isv@default:default,org.eclipse.gef.examples.ui.pde@default:default,org.eclipse.gef@default:default,org.eclipse.gmf.bridge.trace@default:default,org.eclipse.gmf.bridge.ui.dashboard@default:default,org.eclipse.gmf.bridge.ui@default:default,org.eclipse.gmf.bridge@default:default,org.eclipse.gmf.codegen.edit@default:default,org.eclipse.gmf.codegen.ui@default:default,org.eclipse.gmf.codegen.xtend.ui@default:default,org.eclipse.gmf.codegen.xtend@default:default,org.eclipse.gmf.codegen@default:default,org.eclipse.gmf.common@default:default,org.eclipse.gmf.doc.ui@default:default,org.eclipse.gmf.doc@default:default,org.eclipse.gmf.ecore.editor@default:default,org.eclipse.gmf.examples.runtime.diagram.geoshapes@default:default,org.eclipse.gmf.examples.runtime.diagram.logic.model.edit@default:default,org.eclipse.gmf.examples.runtime.diagram.logic.model.editor@default:default,org.eclipse.gmf.examples.runtime.diagram.logic.model@default:default,org.eclipse.gmf.examples.runtime.diagram.logic@default:default,org.eclipse.gmf.examples.runtime.ui.pde@default:default,org.eclipse.gmf.examples.runtime@default:default,org.eclipse.gmf.graphdef.codegen.ui@default:default,org.eclipse.gmf.graphdef.codegen@default:default,org.eclipse.gmf.graphdef.edit@default:default,org.eclipse.gmf.graphdef@default:default,org.eclipse.gmf.map.edit@default:default,org.eclipse.gmf.map@default:default,org.eclipse.gmf.runtime.common.core@default:default,org.eclipse.gmf.runtime.common.ui.action.ide@default:default,org.eclipse.gmf.runtime.common.ui.action@default:default,org.eclipse.gmf.runtime.common.ui.printing.win32@default:false,org.eclipse.gmf.runtime.common.ui.printing@default:default,org.eclipse.gmf.runtime.common.ui.services.action@default:default,org.eclipse.gmf.runtime.common.ui.services.dnd.ide@default:default,org.eclipse.gmf.runtime.common.ui.services.dnd@default:default,org.eclipse.gmf.runtime.common.ui.services.properties@default:default,org.eclipse.gmf.runtime.common.ui.services@default:default,org.eclipse.gmf.runtime.common.ui@default:default,org.eclipse.gmf.runtime.diagram.core@default:default,org.eclipse.gmf.runtime.diagram.ui.actions@default:default,org.eclipse.gmf.runtime.diagram.ui.dnd@default:default,org.eclipse.gmf.runtime.diagram.ui.geoshapes@default:default,org.eclipse.gmf.runtime.diagram.ui.printing.render@default:default,org.eclipse.gmf.runtime.diagram.ui.printing@default:default,org.eclipse.gmf.runtime.diagram.ui.properties@default:default,org.eclipse.gmf.runtime.diagram.ui.providers.ide@default:default,org.eclipse.gmf.runtime.diagram.ui.providers@default:default,org.eclipse.gmf.runtime.diagram.ui.render@default:default,org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide@default:default,org.eclipse.gmf.runtime.diagram.ui.resources.editor@default:default,org.eclipse.gmf.runtime.diagram.ui@default:default,org.eclipse.gmf.runtime.draw2d.ui.render.awt@default:default,org.eclipse.gmf.runtime.draw2d.ui.render@default:default,org.eclipse.gmf.runtime.draw2d.ui@default:default,org.eclipse.gmf.runtime.emf.clipboard.core@default:default,org.eclipse.gmf.runtime.emf.commands.core@default:default,org.eclipse.gmf.runtime.emf.core@default:default,org.eclipse.gmf.runtime.emf.type.core@default:default,org.eclipse.gmf.runtime.emf.type.ui@default:default,org.eclipse.gmf.runtime.emf.ui.properties@default:default,org.eclipse.gmf.runtime.emf.ui@default:default,org.eclipse.gmf.runtime.gef.ui@default:default,org.eclipse.gmf.runtime.lite.svg@default:default,org.eclipse.gmf.runtime.notation.edit@default:default,org.eclipse.gmf.runtime.notation.providers@default:default,org.eclipse.gmf.runtime.notation.sdk@default:default,org.eclipse.gmf.runtime.notation@default:default,org.eclipse.gmf.runtime.sdk@default:default,org.eclipse.gmf.sdk@default:default,org.eclipse.gmf.tooldef.edit@default:default,org.eclipse.gmf.tooldef@default:default,org.eclipse.gmf.tooling.runtime@default:default,org.eclipse.gmf.tooling@default:default,org.eclipse.gmf.validate@default:default,org.eclipse.gmf.xpand.editor@default:default,org.eclipse.gmf.xpand.qvtlibrary@default:default,org.eclipse.gmf.xpand@default:default,org.eclipse.gmf@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help.webapp@default:default,org.eclipse.help@default:default,org.eclipse.jdt.annotation*1.1.100.v20160418-1457@default:default,org.eclipse.jdt.annotation*2.1.0.v20160418-1457@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.doc.isv@default:default,org.eclipse.jdt.doc.user@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching.macosx@default:default,org.eclipse.jdt.launching.ui.macosx@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt@default:default,org.eclipse.jem.util@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.jgit.archive@default:default,org.eclipse.jgit.http.apache@default:default,org.eclipse.jgit@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.m2e.archetype.common@default:default,org.eclipse.m2e.core.ui@default:default,org.eclipse.m2e.core@default:default,org.eclipse.m2e.discovery@default:default,org.eclipse.m2e.editor.xml@default:default,org.eclipse.m2e.editor@default:default,org.eclipse.m2e.importer@default:default,org.eclipse.m2e.jdt.ui@default:false,org.eclipse.m2e.jdt@default:default,org.eclipse.m2e.launching@default:default,org.eclipse.m2e.lifecyclemapping.defaults@default:default,org.eclipse.m2e.maven.indexer@default:default,org.eclipse.m2e.maven.runtime.slf4j.simple@default:default,org.eclipse.m2e.maven.runtime@default:default,org.eclipse.m2e.model.edit@default:default,org.eclipse.m2e.profiles.core@default:default,org.eclipse.m2e.profiles.ui@default:default,org.eclipse.m2e.refactoring@default:default,org.eclipse.m2e.scm@default:default,org.eclipse.m2e.workspace.cli@default:default,org.eclipse.m2m.qvt.oml.common.ui@default:default,org.eclipse.m2m.qvt.oml.common@default:default,org.eclipse.m2m.qvt.oml.cst.parser@default:default,org.eclipse.m2m.qvt.oml.debug.core@default:default,org.eclipse.m2m.qvt.oml.debug.ui@default:default,org.eclipse.m2m.qvt.oml.doc@default:default,org.eclipse.m2m.qvt.oml.ecore.imperativeocl@default:default,org.eclipse.m2m.qvt.oml.editor.ui@default:default,org.eclipse.m2m.qvt.oml.emf.util.ui@default:default,org.eclipse.m2m.qvt.oml.emf.util@default:default,org.eclipse.m2m.qvt.oml.ocl@default:default,org.eclipse.m2m.qvt.oml.project@default:default,org.eclipse.m2m.qvt.oml.runtime.jdt@default:default,org.eclipse.m2m.qvt.oml.runtime.ui@default:default,org.eclipse.m2m.qvt.oml.runtime@default:default,org.eclipse.m2m.qvt.oml.samples@default:default,org.eclipse.m2m.qvt.oml.trace.edit@default:default,org.eclipse.m2m.qvt.oml.ui@default:default,org.eclipse.m2m.qvt.oml@default:default,org.eclipse.mylyn.bugzilla.core@default:default,org.eclipse.mylyn.bugzilla.ui@default:default,org.eclipse.mylyn.builds.core@default:default,org.eclipse.mylyn.builds.ui@default:default,org.eclipse.mylyn.commons.core@default:default,org.eclipse.mylyn.commons.identity.core@default:default,org.eclipse.mylyn.commons.net@default:default,org.eclipse.mylyn.commons.notifications.core@default:default,org.eclipse.mylyn.commons.notifications.feed@default:default,org.eclipse.mylyn.commons.notifications.ui@default:default,org.eclipse.mylyn.commons.repositories.core@default:default,org.eclipse.mylyn.commons.repositories.http.core@default:default,org.eclipse.mylyn.commons.repositories.ui@default:default,org.eclipse.mylyn.commons.screenshots@default:default,org.eclipse.mylyn.commons.ui@default:default,org.eclipse.mylyn.commons.workbench@default:default,org.eclipse.mylyn.commons.xmlrpc@default:default,org.eclipse.mylyn.context.core@default:default,org.eclipse.mylyn.context.tasks.ui@default:default,org.eclipse.mylyn.context.ui@default:default,org.eclipse.mylyn.debug.ui@default:default,org.eclipse.mylyn.discovery.core@default:default,org.eclipse.mylyn.discovery.ui@default:default,org.eclipse.mylyn.gerrit.core@default:default,org.eclipse.mylyn.gerrit.dashboard.core@default:default,org.eclipse.mylyn.gerrit.dashboard.ui@default:default,org.eclipse.mylyn.gerrit.ui@default:default,org.eclipse.mylyn.git.core@default:default,org.eclipse.mylyn.git.ui@default:default,org.eclipse.mylyn.hudson.core@default:default,org.eclipse.mylyn.hudson.ui@default:default,org.eclipse.mylyn.ide.ant@default:default,org.eclipse.mylyn.ide.ui@default:default,org.eclipse.mylyn.java.tasks@default:default,org.eclipse.mylyn.java.ui@default:default,org.eclipse.mylyn.monitor.core@default:default,org.eclipse.mylyn.monitor.ui@default:default,org.eclipse.mylyn.resources.ui@default:default,org.eclipse.mylyn.reviews.core@default:default,org.eclipse.mylyn.reviews.edit@default:default,org.eclipse.mylyn.reviews.ui@default:default,org.eclipse.mylyn.tasks.core@default:default,org.eclipse.mylyn.tasks.index.core@default:default,org.eclipse.mylyn.tasks.index.ui@default:default,org.eclipse.mylyn.tasks.search@default:default,org.eclipse.mylyn.tasks.ui@default:default,org.eclipse.mylyn.team.ui@default:default,org.eclipse.mylyn.versions.core@default:default,org.eclipse.mylyn.versions.ui@default:default,org.eclipse.mylyn.wikitext.asciidoc.core@default:default,org.eclipse.mylyn.wikitext.asciidoc.ui@default:default,org.eclipse.mylyn.wikitext.confluence.core@default:default,org.eclipse.mylyn.wikitext.confluence.ui@default:default,org.eclipse.mylyn.wikitext.context.ui@default:default,org.eclipse.mylyn.wikitext.core.ant@default:default,org.eclipse.mylyn.wikitext.core.osgi@default:default,org.eclipse.mylyn.wikitext.core@default:default,org.eclipse.mylyn.wikitext.help.ui@default:default,org.eclipse.mylyn.wikitext.html.core@default:default,org.eclipse.mylyn.wikitext.markdown.core@default:default,org.eclipse.mylyn.wikitext.markdown.ui@default:default,org.eclipse.mylyn.wikitext.mediawiki.core.ant@default:default,org.eclipse.mylyn.wikitext.mediawiki.core@default:default,org.eclipse.mylyn.wikitext.mediawiki.ui@default:default,org.eclipse.mylyn.wikitext.tasks.ui@default:default,org.eclipse.mylyn.wikitext.textile.core@default:default,org.eclipse.mylyn.wikitext.textile.ui@default:default,org.eclipse.mylyn.wikitext.tracwiki.core@default:default,org.eclipse.mylyn.wikitext.tracwiki.ui@default:default,org.eclipse.mylyn.wikitext.twiki.core@default:default,org.eclipse.mylyn.wikitext.twiki.ui@default:default,org.eclipse.mylyn.wikitext.ui@default:default,org.eclipse.nebula.widgets.nattable.core@default:default,org.eclipse.nebula.widgets.nattable.extension.glazedlists@default:default,org.eclipse.nebula.widgets.nattable.extension.nebula@default:default,org.eclipse.nebula.widgets.richtext@default:default,org.eclipse.nebula.widgets.tablecombo@default:default,org.eclipse.net4j.db.doc@default:default,org.eclipse.net4j.db.h2@default:default,org.eclipse.net4j.db.jdbc@default:default,org.eclipse.net4j.db@default:default,org.eclipse.net4j.debug@default:default,org.eclipse.net4j.defs@default:default,org.eclipse.net4j.doc@default:default,org.eclipse.net4j.examples.installer@default:default,org.eclipse.net4j.http.common@default:default,org.eclipse.net4j.http.server@default:default,org.eclipse.net4j.http@default:default,org.eclipse.net4j.jvm@default:default,org.eclipse.net4j.sdk@default:default,org.eclipse.net4j.tcp@default:default,org.eclipse.net4j.ui.defs@default:default,org.eclipse.net4j.ui.shared@default:default,org.eclipse.net4j.ui@default:default,org.eclipse.net4j.util.defs@default:default,org.eclipse.net4j.util.doc@default:default,org.eclipse.net4j.util.ui@default:default,org.eclipse.net4j.util@default:default,org.eclipse.net4j@default:default,org.eclipse.ocl.common.ui@default:default,org.eclipse.ocl.common@default:default,org.eclipse.ocl.doc@default:default,org.eclipse.ocl.ecore.edit@default:default,org.eclipse.ocl.ecore.tests@default:default,org.eclipse.ocl.ecore@default:default,org.eclipse.ocl.edit@default:default,org.eclipse.ocl.examples.classic@default:default,org.eclipse.ocl.examples.codegen@default:default,org.eclipse.ocl.examples.debug.ui@default:default,org.eclipse.ocl.examples.debug.vm.ui@default:default,org.eclipse.ocl.examples.debug.vm@default:default,org.eclipse.ocl.examples.debug@default:default,org.eclipse.ocl.examples.domain@default:default,org.eclipse.ocl.examples.emf.validation.validity.ui@default:default,org.eclipse.ocl.examples.emf.validation.validity@default:default,org.eclipse.ocl.examples.eventmanager.tests@default:default,org.eclipse.ocl.examples.eventmanager@default:default,org.eclipse.ocl.examples.impactanalyzer.testmodel.company@default:default,org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm@default:default,org.eclipse.ocl.examples.impactanalyzer.tests@default:default,org.eclipse.ocl.examples.impactanalyzer.testutils@default:default,org.eclipse.ocl.examples.impactanalyzer.ui@default:default,org.eclipse.ocl.examples.impactanalyzer.util@default:default,org.eclipse.ocl.examples.impactanalyzer@default:default,org.eclipse.ocl.examples.interpreter@default:default,org.eclipse.ocl.examples.library@default:default,org.eclipse.ocl.examples.pivot@default:default,org.eclipse.ocl.examples.standalone@default:default,org.eclipse.ocl.examples.tests@default:default,org.eclipse.ocl.examples.testutils@default:default,org.eclipse.ocl.examples.ui@default:default,org.eclipse.ocl.examples.uml25@default:default,org.eclipse.ocl.examples.unified@default:default,org.eclipse.ocl.examples.validity.test@default:default,org.eclipse.ocl.examples.validity@default:default,org.eclipse.ocl.examples.xtext.base.ui@default:default,org.eclipse.ocl.examples.xtext.base@default:default,org.eclipse.ocl.examples.xtext.completeocl.ui@default:default,org.eclipse.ocl.examples.xtext.completeocl@default:default,org.eclipse.ocl.examples.xtext.console@default:default,org.eclipse.ocl.examples.xtext.essentialocl.ui@default:default,org.eclipse.ocl.examples.xtext.essentialocl@default:default,org.eclipse.ocl.examples.xtext.markup.ui@default:default,org.eclipse.ocl.examples.xtext.markup@default:default,org.eclipse.ocl.examples.xtext.oclinecore.ui@default:default,org.eclipse.ocl.examples.xtext.oclinecore@default:default,org.eclipse.ocl.examples.xtext.oclstdlib.ui@default:default,org.eclipse.ocl.examples.xtext.oclstdlib@default:default,org.eclipse.ocl.examples.xtext.tests@default:default,org.eclipse.ocl.examples@default:default,org.eclipse.ocl.master@default:default,org.eclipse.ocl.pivot.ui@default:default,org.eclipse.ocl.pivot.uml@default:default,org.eclipse.ocl.pivot@default:default,org.eclipse.ocl.tests@default:default,org.eclipse.ocl.ui@default:default,org.eclipse.ocl.uml.edit@default:default,org.eclipse.ocl.uml.tests@default:default,org.eclipse.ocl.uml.ui@default:default,org.eclipse.ocl.uml@default:default,org.eclipse.ocl.xtext.base.ui@default:default,org.eclipse.ocl.xtext.base@default:default,org.eclipse.ocl.xtext.completeocl.ui@default:default,org.eclipse.ocl.xtext.completeocl@default:default,org.eclipse.ocl.xtext.essentialocl.ui@default:default,org.eclipse.ocl.xtext.essentialocl@default:default,org.eclipse.ocl.xtext.markup.ui@default:default,org.eclipse.ocl.xtext.markup@default:default,org.eclipse.ocl.xtext.oclinecore.ui@default:default,org.eclipse.ocl.xtext.oclinecore@default:default,org.eclipse.ocl.xtext.oclstdlib.ui@default:default,org.eclipse.ocl.xtext.oclstdlib@default:default,org.eclipse.ocl@default:default,org.eclipse.oomph.base.edit@default:default,org.eclipse.oomph.base@default:default,org.eclipse.oomph.extractor.lib@default:default,org.eclipse.oomph.jreinfo.ui@default:default,org.eclipse.oomph.jreinfo@default:default,org.eclipse.oomph.p2.core@default:default,org.eclipse.oomph.p2.doc@default:default,org.eclipse.oomph.p2.edit@default:default,org.eclipse.oomph.p2.ui@default:default,org.eclipse.oomph.p2@default:default,org.eclipse.oomph.predicates.edit@default:default,org.eclipse.oomph.predicates@default:default,org.eclipse.oomph.preferences.edit@default:default,org.eclipse.oomph.preferences.editor@default:default,org.eclipse.oomph.preferences@default:default,org.eclipse.oomph.projectconfig.edit@default:default,org.eclipse.oomph.projectconfig.editor@default:default,org.eclipse.oomph.projectconfig@default:default,org.eclipse.oomph.resources.edit@default:default,org.eclipse.oomph.resources@default:default,org.eclipse.oomph.setup.core@default:default,org.eclipse.oomph.setup.doc@default:default,org.eclipse.oomph.setup.edit@default:default,org.eclipse.oomph.setup.editor@default:default,org.eclipse.oomph.setup.git.edit@default:default,org.eclipse.oomph.setup.git@default:default,org.eclipse.oomph.setup.jdt.edit@default:default,org.eclipse.oomph.setup.jdt@default:default,org.eclipse.oomph.setup.launching.edit@default:default,org.eclipse.oomph.setup.launching@default:default,org.eclipse.oomph.setup.maven.edit@default:default,org.eclipse.oomph.setup.maven@default:default,org.eclipse.oomph.setup.mylyn.edit@default:default,org.eclipse.oomph.setup.mylyn@default:default,org.eclipse.oomph.setup.p2.edit@default:default,org.eclipse.oomph.setup.p2@default:default,org.eclipse.oomph.setup.pde.edit@default:default,org.eclipse.oomph.setup.pde@default:default,org.eclipse.oomph.setup.projects.edit@default:default,org.eclipse.oomph.setup.projects@default:default,org.eclipse.oomph.setup.projectset.edit@default:default,org.eclipse.oomph.setup.projectset@default:default,org.eclipse.oomph.setup.sdk@default:default,org.eclipse.oomph.setup.sync@default:default,org.eclipse.oomph.setup.targlets.edit@default:default,org.eclipse.oomph.setup.targlets@default:default,org.eclipse.oomph.setup.ui.ide@default:default,org.eclipse.oomph.setup.ui.questionnaire@default:default,org.eclipse.oomph.setup.ui@default:default,org.eclipse.oomph.setup.workbench.edit@default:default,org.eclipse.oomph.setup.workbench@default:default,org.eclipse.oomph.setup.workingsets.edit@default:default,org.eclipse.oomph.setup.workingsets@default:default,org.eclipse.oomph.setup@default:default,org.eclipse.oomph.targlets.core@default:default,org.eclipse.oomph.targlets.doc@default:default,org.eclipse.oomph.targlets.edit@default:default,org.eclipse.oomph.targlets.editor@default:default,org.eclipse.oomph.targlets.ui@default:default,org.eclipse.oomph.targlets@default:default,org.eclipse.oomph.ui@default:default,org.eclipse.oomph.util.pde@default:default,org.eclipse.oomph.util@default:default,org.eclipse.oomph.version.digest@default:default,org.eclipse.oomph.version.ui@default:default,org.eclipse.oomph.version@default:default,org.eclipse.oomph.workingsets.edit@default:default,org.eclipse.oomph.workingsets.editor@default:default,org.eclipse.oomph.workingsets@default:default,org.eclipse.orbit.mongodb@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.papyrus.cdo.ui.doc@default:default,org.eclipse.papyrus.copypaste.ui.doc@default:default,org.eclipse.papyrus.dsml.validation.doc@default:default,org.eclipse.papyrus.dsml.validation@default:default,org.eclipse.papyrus.infra.doc@default:default,org.eclipse.papyrus.infra.gmfdiag.common.doc@default:default,org.eclipse.papyrus.infra.gmfdiag.css.doc@default:default,org.eclipse.papyrus.infra.nattable.doc@default:default,org.eclipse.papyrus.infra.newchild.doc@default:default,org.eclipse.papyrus.infra.services.controlmode.doc@default:default,org.eclipse.papyrus.infra.types.doc@default:default,org.eclipse.papyrus.infra.viewpoints.doc@default:default,org.eclipse.papyrus.layers.documentation@default:default,org.eclipse.papyrus.m2m.qvto@default:default,org.eclipse.papyrus.migration.rsa@default:default,org.eclipse.papyrus.req.reqif.doc@default:default,org.eclipse.papyrus.sysml14.diagram.blockdefinition@default:default,org.eclipse.papyrus.sysml14.diagram.common@default:default,org.eclipse.papyrus.sysml14.diagram.internalblock@default:default,org.eclipse.papyrus.sysml14.diagram.parametric@default:default,org.eclipse.papyrus.sysml14.diagram.requirement@default:default,org.eclipse.papyrus.sysml14.edit@default:default,org.eclipse.papyrus.sysml14.nattable.allocation@default:default,org.eclipse.papyrus.sysml14.nattable.common@default:default,org.eclipse.papyrus.sysml14.nattable.requirement@default:default,org.eclipse.papyrus.sysml14.nattable.ui@default:default,org.eclipse.papyrus.sysml14.service.types@default:default,org.eclipse.papyrus.sysml14.ui@default:default,org.eclipse.papyrus.sysml14.validation@default:default,org.eclipse.papyrus.sysml14.viewpoint@default:default,org.eclipse.papyrus.sysml14@default:default,org.eclipse.papyrus.uml.decoratormodel.doc@default:default,org.eclipse.papyrus.uml.diagram.common.doc@default:default,org.eclipse.papyrus.uml.diagram.profile.doc@default:default,org.eclipse.papyrus.uml.doc@default:default,org.eclipse.papyrus.uml.modelrepair.doc@default:default,org.eclipse.papyrus.uml.oclconstraintevaluation@default:default,org.eclipse.papyrus.uml.profile.assistants.doc@default:default,org.eclipse.papyrus.uml.search.ui.doc@default:default,org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext@default:default,org.eclipse.papyrus.views.properties.doc@default:default,org.eclipse.papyrus.views.references.doc@default:default,org.eclipse.pde.api.tools.annotations@default:default,org.eclipse.pde.api.tools.ui@default:default,org.eclipse.pde.api.tools@default:default,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.pde.ds.annotations@default:default,org.eclipse.pde.ds.core@default:default,org.eclipse.pde.ds.ui@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.pde.launching@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.pde.ua.core@default:default,org.eclipse.pde.ua.ui@default:default,org.eclipse.pde.ui.templates@default:default,org.eclipse.pde.ui@default:default,org.eclipse.pde@default:default,org.eclipse.platform.doc.isv@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.platform@default:default,org.eclipse.rcp@default:default,org.eclipse.recommenders.apidocs.rcp@default:default,org.eclipse.recommenders.apidocs@default:default,org.eclipse.recommenders.calls.rcp@default:default,org.eclipse.recommenders.calls@default:default,org.eclipse.recommenders.chain.rcp@default:default,org.eclipse.recommenders.completion.rcp@default:default,org.eclipse.recommenders.constructors.rcp@default:default,org.eclipse.recommenders.constructors@default:default,org.eclipse.recommenders.coordinates.rcp@default:default,org.eclipse.recommenders.coordinates@default:default,org.eclipse.recommenders.injection@default:default,org.eclipse.recommenders.jayes.io@default:default,org.eclipse.recommenders.jayes@default:default,org.eclipse.recommenders.jdt@default:default,org.eclipse.recommenders.models.rcp@default:default,org.eclipse.recommenders.models@default:default,org.eclipse.recommenders.mylyn.rcp@default:default,org.eclipse.recommenders.net@default:default,org.eclipse.recommenders.news.api@default:default,org.eclipse.recommenders.news.impl@default:default,org.eclipse.recommenders.news.rcp@default:default,org.eclipse.recommenders.news@default:default,org.eclipse.recommenders.overrides.rcp@default:default,org.eclipse.recommenders.overrides@default:default,org.eclipse.recommenders.rcp@default:default,org.eclipse.recommenders.snipmatch.rcp@default:default,org.eclipse.recommenders.snipmatch@default:default,org.eclipse.recommenders.subwords.rcp@default:default,org.eclipse.recommenders.types.rcp@default:default,org.eclipse.recommenders.utils.rcp@default:default,org.eclipse.recommenders.utils@default:default,org.eclipse.search@default:default,org.eclipse.sirius.common.acceleo.aql.ide@default:default,org.eclipse.sirius.common.acceleo.aql@default:default,org.eclipse.sirius.common.acceleo.mtl.ide@default:default,org.eclipse.sirius.common.acceleo.mtl@default:default,org.eclipse.sirius.common.interpreter@default:default,org.eclipse.sirius.common.ocl@default:default,org.eclipse.sirius.common.ui.ext@default:default,org.eclipse.sirius.common.ui@default:default,org.eclipse.sirius.common.xtext@default:default,org.eclipse.sirius.common@default:default,org.eclipse.sirius.diagram.formatdata@default:default,org.eclipse.sirius.diagram.layoutdata@default:default,org.eclipse.sirius.diagram.sequence.edit@default:default,org.eclipse.sirius.diagram.sequence.ui@default:default,org.eclipse.sirius.diagram.sequence@default:default,org.eclipse.sirius.diagram.ui.ext@default:default,org.eclipse.sirius.diagram.ui@default:default,org.eclipse.sirius.diagram@default:default,org.eclipse.sirius.doc@default:default,org.eclipse.sirius.ecore.extender@default:default,org.eclipse.sirius.editor.diagram@default:default,org.eclipse.sirius.editor.properties.ext.widgets.reference@default:default,org.eclipse.sirius.editor.properties@default:default,org.eclipse.sirius.editor.sequence@default:default,org.eclipse.sirius.editor.table@default:default,org.eclipse.sirius.editor.tree@default:default,org.eclipse.sirius.editor@default:default,org.eclipse.sirius.eef.adapters@default:default,org.eclipse.sirius.ext.base@default:default,org.eclipse.sirius.ext.draw2d@default:default,org.eclipse.sirius.ext.e3.ui@default:default,org.eclipse.sirius.ext.e3@default:default,org.eclipse.sirius.ext.emf.edit@default:default,org.eclipse.sirius.ext.emf.tx@default:default,org.eclipse.sirius.ext.emf.ui@default:default,org.eclipse.sirius.ext.emf@default:default,org.eclipse.sirius.ext.gef@default:default,org.eclipse.sirius.ext.gmf.notation@default:default,org.eclipse.sirius.ext.gmf.runtime@default:default,org.eclipse.sirius.ext.jface@default:default,org.eclipse.sirius.ext.swt@default:default,org.eclipse.sirius.interpreter@default:default,org.eclipse.sirius.properties.edit@default:default,org.eclipse.sirius.properties.ext.widgets.reference.edit@default:default,org.eclipse.sirius.properties.ext.widgets.reference@default:default,org.eclipse.sirius.properties@default:default,org.eclipse.sirius.samples.family@default:default,org.eclipse.sirius.synchronizer@default:default,org.eclipse.sirius.table.ui.ext@default:default,org.eclipse.sirius.table.ui@default:default,org.eclipse.sirius.table@default:default,org.eclipse.sirius.tree.ui.ext@default:default,org.eclipse.sirius.tree.ui@default:default,org.eclipse.sirius.tree@default:default,org.eclipse.sirius.ui.ext@default:default,org.eclipse.sirius.ui.properties.ext.widgets.reference@default:default,org.eclipse.sirius.ui.properties@default:default,org.eclipse.sirius.ui@default:default,org.eclipse.sirius@default:default,org.eclipse.swt.cocoa.macosx.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.swtbot.eclipse.finder@default:default,org.eclipse.swtbot.junit4_x@default:default,org.eclipse.swtbot.swt.finder@default:default,org.eclipse.team.core@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.team.cvs.ssh2@default:default,org.eclipse.team.cvs.ui@default:default,org.eclipse.team.svn.core@default:default,org.eclipse.team.svn.help@default:default,org.eclipse.team.svn.ui.startup@default:default,org.eclipse.team.svn.ui@default:default,org.eclipse.team.svn@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.browser@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro.quicklinks@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.monitoring@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.net@default:default,org.eclipse.ui.themes@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.uml2.codegen.ecore@default:default,org.eclipse.uml2.common.edit@default:default,org.eclipse.uml2.common@default:default,org.eclipse.uml2.types@default:default,org.eclipse.uml2.uml.edit@default:default,org.eclipse.uml2.uml.editor@default:default,org.eclipse.uml2.uml.profile.standard@default:default,org.eclipse.uml2.uml.resources@default:default,org.eclipse.uml2.uml.validation@default:default,org.eclipse.uml2.uml@default:default,org.eclipse.update.configurator@3:true,org.eclipse.upr.depl.papyrus@default:default,org.eclipse.upr.depl@default:default,org.eclipse.upr.soaml.papyrus@default:default,org.eclipse.upr.soaml@default:default,org.eclipse.upr.utp.papyrus@default:default,org.eclipse.upr.utp@default:default,org.eclipse.userstorage.ui@default:default,org.eclipse.userstorage@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.wst.common.frameworks.ui@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.wst.common.ui@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.wst.sse.ui@default:default,org.eclipse.wst.validation.ui@default:default,org.eclipse.wst.validation@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.wst.xml.ui@default:default,org.eclipse.wst.xsd.core@default:default,org.eclipse.xpand@default:default,org.eclipse.xsd@default:default,org.eclipse.xtend.core@default:default,org.eclipse.xtend.doc@default:default,org.eclipse.xtend.examples@default:default,org.eclipse.xtend.ide.common@default:default,org.eclipse.xtend.ide@default:default,org.eclipse.xtend.lib.macro@default:default,org.eclipse.xtend.lib@default:default,org.eclipse.xtend.m2e@default:default,org.eclipse.xtend.standalone@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.xtend2.lib@default:default,org.eclipse.xtend@default:default,org.eclipse.xtext.activities@default:default,org.eclipse.xtext.builder.standalone@default:default,org.eclipse.xtext.builder@default:default,org.eclipse.xtext.common.types.edit@default:default,org.eclipse.xtext.common.types.shared.jdt38@default:false,org.eclipse.xtext.common.types.shared@default:default,org.eclipse.xtext.common.types.ui@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.xtext.doc@default:default,org.eclipse.xtext.ecore@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.xtext.ide@default:default,org.eclipse.xtext.idea.generator@default:default,org.eclipse.xtext.java@default:default,org.eclipse.xtext.junit4@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.xtext.m2e@default:default,org.eclipse.xtext.purexbase.ui@default:default,org.eclipse.xtext.purexbase@default:default,org.eclipse.xtext.smap@default:default,org.eclipse.xtext.ui.codetemplates.ui@default:default,org.eclipse.xtext.ui.codetemplates@default:default,org.eclipse.xtext.ui.ecore@default:default,org.eclipse.xtext.ui.shared@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.xtext.util@default:default,org.eclipse.xtext.xbase.ide@default:default,org.eclipse.xtext.xbase.junit@default:default,org.eclipse.xtext.xbase.lib@default:default,org.eclipse.xtext.xbase.ui@default:default,org.eclipse.xtext.xbase@default:default,org.eclipse.xtext.xtext.generator@default:default,org.eclipse.xtext.xtext.ui.examples@default:default,org.eclipse.xtext.xtext.ui.graph@default:default,org.eclipse.xtext.xtext.ui@default:default,org.eclipse.xtext.xtext.wizard@default:default,org.eclipse.xtext@default:default,org.eclipse.xwt@default:default,org.gradle.toolingapi@default:default,org.h2@default:default,org.hamcrest.core@default:default,org.hamcrest.integration@default:default,org.hamcrest.library@default:default,org.hamcrest.text@default:default,org.hamcrest@default:default,org.jsoup@default:default,org.junit@default:default,org.kohsuke.args4j@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,org.polarion.eclipse.team.svn.connector.javahl19@default:default,org.polarion.eclipse.team.svn.connector@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.slf4j.impl.log4j12@default:false,org.sonatype.m2e.mavenarchiver@default:default,org.sonatype.tycho.m2e@default:default,org.tukaani.xz@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.papyrus.bundles.tests@default:default,org.eclipse.papyrus.codegen@default:default,org.eclipse.papyrus.customization.nattableconfiguration@default:default,org.eclipse.papyrus.customization.palette@default:default,org.eclipse.papyrus.customization.paletteconfiguration@default:default,org.eclipse.papyrus.customization.properties.generation@default:default,org.eclipse.papyrus.customization.properties.model.xwt@default:default,org.eclipse.papyrus.customization.properties@default:default,org.eclipse.papyrus.customization@default:default,org.eclipse.papyrus.def@default:default,org.eclipse.papyrus.dev.assistants.codegen@default:default,org.eclipse.papyrus.dev.java.utils@default:default,org.eclipse.papyrus.dev.project.management@default:default,org.eclipse.papyrus.dev.tests.framework.ui@default:default,org.eclipse.papyrus.dev.tests.framework@default:default,org.eclipse.papyrus.dev.types@default:default,org.eclipse.papyrus.dev.view.services.edit.request@default:default,org.eclipse.papyrus.developer.profile@default:default,org.eclipse.papyrus.eclipse.project.editors.tests@default:default,org.eclipse.papyrus.eclipse.project.editors@default:default,org.eclipse.papyrus.editor.integration.tests@default:default,org.eclipse.papyrus.editor.perspectiveconfiguration@default:default,org.eclipse.papyrus.editor@default:default,org.eclipse.papyrus.emf.facet.aggregate.doc@default:default,org.eclipse.papyrus.emf.facet.common.core@default:default,org.eclipse.papyrus.emf.facet.common.sdk.core@default:default,org.eclipse.papyrus.emf.facet.common.ui@default:default,org.eclipse.papyrus.emf.facet.custom.core@default:default,org.eclipse.papyrus.emf.facet.custom.doc@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel.edit@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel.editor.doc@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel.editor@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel@default:default,org.eclipse.papyrus.emf.facet.custom.sdk.core@default:default,org.eclipse.papyrus.emf.facet.custom.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.custom.ui@default:default,org.eclipse.papyrus.emf.facet.doc@default:default,org.eclipse.papyrus.emf.facet.efacet.catalog@default:default,org.eclipse.papyrus.emf.facet.efacet.core@default:default,org.eclipse.papyrus.emf.facet.efacet.doc@default:default,org.eclipse.papyrus.emf.facet.efacet.edit@default:default,org.eclipse.papyrus.emf.facet.efacet.editor@default:default,org.eclipse.papyrus.emf.facet.efacet.metamodel.edit@default:default,org.eclipse.papyrus.emf.facet.efacet.metamodel@default:default,org.eclipse.papyrus.emf.facet.efacet.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.efacet.ui@default:default,org.eclipse.papyrus.emf.facet.efacet@default:default,org.eclipse.papyrus.emf.facet.query.java.core@default:default,org.eclipse.papyrus.emf.facet.query.java.metamodel@default:default,org.eclipse.papyrus.emf.facet.query.java.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.query.java@default:default,org.eclipse.papyrus.emf.facet.query.ocl.core@default:default,org.eclipse.papyrus.emf.facet.query.ocl.metamodel@default:default,org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.util.core@default:default,org.eclipse.papyrus.emf.facet.util.emf.catalog@default:default,org.eclipse.papyrus.emf.facet.util.emf.core@default:default,org.eclipse.papyrus.emf.facet.util.emf.doc@default:default,org.eclipse.papyrus.emf.facet.util.emf.ui@default:default,org.eclipse.papyrus.emf.facet.util.jface.ui@default:default,org.eclipse.papyrus.emf.facet.util.pde.core@default:default,org.eclipse.papyrus.emf.facet.util.swt@default:default,org.eclipse.papyrus.emf.facet.util.ui@default:default,org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore@default:default,org.eclipse.papyrus.emf.facet.widgets.celleditors@default:default,org.eclipse.papyrus.emf.facet.widgets@default:default,org.eclipse.papyrus.extensionpoints.editors@default:default,org.eclipse.papyrus.gmf.editpartview@default:default,org.eclipse.papyrus.gmf.editpoliciesstates@default:default,org.eclipse.papyrus.gmf.figureview@default:default,org.eclipse.papyrus.gmfgenextension@default:default,org.eclipse.papyrus.infra.core.architecture.edit@default:default,org.eclipse.papyrus.infra.architecture.representation.edit@default:default,org.eclipse.papyrus.infra.architecture.representation@default:default,org.eclipse.papyrus.infra.architecture@default:default,org.eclipse.papyrus.infra.core.architecture.ui@default:default,org.eclipse.papyrus.infra.core.architecture@default:default,org.eclipse.papyrus.infra.constraints.edit@default:default,org.eclipse.papyrus.infra.constraints.editor@default:default,org.eclipse.papyrus.infra.constraints.ui@default:default,org.eclipse.papyrus.infra.constraints@default:default,org.eclipse.papyrus.infra.core.clipboard.tests@default:default,org.eclipse.papyrus.infra.core.log@default:default,org.eclipse.papyrus.infra.core.pluginexplorer@default:default,org.eclipse.papyrus.infra.core.sasheditor.di.tests@default:default,org.eclipse.papyrus.infra.core.sasheditor.di@default:default,org.eclipse.papyrus.infra.core.sasheditor.tests@default:default,org.eclipse.papyrus.infra.core.sasheditor@default:default,org.eclipse.papyrus.infra.core.sashwindows.di@default:default,org.eclipse.papyrus.infra.core.tests@default:default,org.eclipse.papyrus.infra.core@default:default,org.eclipse.papyrus.infra.discovery.ui.menu@default:default,org.eclipse.papyrus.infra.discovery.ui@default:default,org.eclipse.papyrus.infra.discovery@default:default,org.eclipse.papyrus.infra.editor.welcome.internationalization@default:default,org.eclipse.papyrus.infra.editor.welcome.nattable@default:default,org.eclipse.papyrus.infra.editor.welcome.tests@default:default,org.eclipse.papyrus.infra.editor.welcome@default:default,org.eclipse.papyrus.infra.emf.appearance@default:default,org.eclipse.papyrus.infra.emf.commandstack@default:default,org.eclipse.papyrus.infra.emf.diagram.common@default:default,org.eclipse.papyrus.infra.emf.gmf.tests@default:default,org.eclipse.papyrus.infra.emf.gmf@default:default,org.eclipse.papyrus.infra.emf.nattable@default:default,org.eclipse.papyrus.infra.emf.readonly.tests@default:default,org.eclipse.papyrus.infra.emf.readonly@default:default,org.eclipse.papyrus.infra.emf.tests@default:default,org.eclipse.papyrus.infra.emf.types.ui.properties@default:default,org.eclipse.papyrus.infra.emf.types.ui@default:default,org.eclipse.papyrus.infra.emf.types@default:default,org.eclipse.papyrus.infra.emf@default:default,org.eclipse.papyrus.infra.filters.edit@default:default,org.eclipse.papyrus.infra.filters.tests@default:default,org.eclipse.papyrus.infra.filters@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant.edit@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant.editor@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant.ui@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant@default:default,org.eclipse.papyrus.infra.gmfdiag.canonical.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.canonical@default:default,org.eclipse.papyrus.infra.gmfdiag.commands.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.commands@default:default,org.eclipse.papyrus.infra.gmfdiag.common.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.common@default:default,org.eclipse.papyrus.infra.gmfdiag.controlmode@default:default,org.eclipse.papyrus.infra.gmfdiag.css.configuration@default:default,org.eclipse.papyrus.infra.gmfdiag.css.debug@default:default,org.eclipse.papyrus.infra.gmfdiag.css.model@default:default,org.eclipse.papyrus.infra.gmfdiag.css.properties@default:default,org.eclipse.papyrus.infra.gmfdiag.css.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.css.theme@default:default,org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui@default:default,org.eclipse.papyrus.infra.gmfdiag.css3.xtext@default:default,org.eclipse.papyrus.infra.gmfdiag.css@default:default,org.eclipse.papyrus.infra.gmfdiag.dnd@default:default,org.eclipse.papyrus.infra.gmfdiag.expansion.edit@default:default,org.eclipse.papyrus.infra.gmfdiag.expansion.editor@default:default,org.eclipse.papyrus.infra.gmfdiag.export@default:default,org.eclipse.papyrus.infra.gmfdiag.gef@default:default,org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter@default:default,org.eclipse.papyrus.infra.gmfdiag.hyperlink@default:default,org.eclipse.papyrus.infra.gmfdiag.menu.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.menu@default:default,org.eclipse.papyrus.infra.gmfdiag.modelexplorer@default:default,org.eclipse.papyrus.infra.gmfdiag.navigation@default:default,org.eclipse.papyrus.infra.gmfdiag.outline@default:default,org.eclipse.papyrus.infra.gmfdiag.preferences@default:default,org.eclipse.papyrus.infra.gmfdiag.properties@default:default,org.eclipse.papyrus.infra.gmfdiag.viewersearcher@default:default,org.eclipse.papyrus.infra.gmfdiag.welcome.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.welcome@default:default,org.eclipse.papyrus.infra.gmfdiag.widgets@default:default,org.eclipse.papyrus.infra.hyperlink@default:default,org.eclipse.papyrus.infra.internationalization.common@default:default,org.eclipse.papyrus.infra.internationalization.controlmode@default:default,org.eclipse.papyrus.infra.internationalization.edit@default:default,org.eclipse.papyrus.infra.internationalization.readonly@default:default,org.eclipse.papyrus.infra.internationalization.tests@default:default,org.eclipse.papyrus.infra.internationalization.ui@default:default,org.eclipse.papyrus.infra.internationalization.utils@default:default,org.eclipse.papyrus.infra.internationalization@default:default,org.eclipse.papyrus.infra.nattable.common.tests@default:default,org.eclipse.papyrus.infra.nattable.common@default:default,org.eclipse.papyrus.infra.nattable.controlmode@default:default,org.eclipse.papyrus.infra.nattable.gmfdiag@default:default,org.eclipse.papyrus.infra.nattable.model.edit@default:default,org.eclipse.papyrus.infra.nattable.model.editor.tests@default:default,org.eclipse.papyrus.infra.nattable.model.editor@default:default,org.eclipse.papyrus.infra.nattable.model.tests@default:default,org.eclipse.papyrus.infra.nattable.model@default:default,org.eclipse.papyrus.infra.nattable.modelexplorer@default:default,org.eclipse.papyrus.infra.nattable.properties@default:default,org.eclipse.papyrus.infra.nattable.tests@default:default,org.eclipse.papyrus.infra.nattable.views.config@default:default,org.eclipse.papyrus.infra.nattable.views.editor@default:default,org.eclipse.papyrus.infra.nattable.views.tests@default:default,org.eclipse.papyrus.infra.nattable@default:default,org.eclipse.papyrus.infra.newchild.edit@default:default,org.eclipse.papyrus.infra.newchild.editor@default:default,org.eclipse.papyrus.infra.newchild.tests@default:default,org.eclipse.papyrus.infra.newchild.ui@default:default,org.eclipse.papyrus.infra.newchild@default:default,org.eclipse.papyrus.infra.onefile.ui@default:default,org.eclipse.papyrus.infra.onefile@default:default,org.eclipse.papyrus.infra.properties.edit@default:default,org.eclipse.papyrus.infra.properties.editor@default:default,org.eclipse.papyrus.infra.properties.ui.tests@default:default,org.eclipse.papyrus.infra.properties.ui@default:default,org.eclipse.papyrus.infra.properties@default:default,org.eclipse.papyrus.infra.psf@default:default,org.eclipse.papyrus.infra.services.controlmode.history@default:default,org.eclipse.papyrus.infra.services.controlmode.tests@default:default,org.eclipse.papyrus.infra.services.controlmode@default:default,org.eclipse.papyrus.infra.services.decoration@default:default,org.eclipse.papyrus.infra.services.edit.tests@default:default,org.eclipse.papyrus.infra.services.edit.ui.tests@default:default,org.eclipse.papyrus.infra.services.edit.ui@default:default,org.eclipse.papyrus.infra.services.edit@default:default,org.eclipse.papyrus.infra.services.labelprovider.tests@default:default,org.eclipse.papyrus.infra.services.labelprovider@default:default,org.eclipse.papyrus.infra.services.localizer@default:default,org.eclipse.papyrus.infra.services.markerlistener@default:default,org.eclipse.papyrus.infra.services.navigation@default:default,org.eclipse.papyrus.infra.services.openelement@default:default,org.eclipse.papyrus.infra.services.resourceloading.tests@default:default,org.eclipse.papyrus.infra.services.resourceloading.ui@default:default,org.eclipse.papyrus.infra.services.resourceloading@default:default,org.eclipse.papyrus.infra.services.semantic.tests@default:default,org.eclipse.papyrus.infra.services.semantic@default:default,org.eclipse.papyrus.infra.services.validation@default:default,org.eclipse.papyrus.infra.services.viewersearch@default:default,org.eclipse.papyrus.infra.services.viewlabelprovider@default:default,org.eclipse.papyrus.infra.sync@default:default,org.eclipse.papyrus.infra.tools.tests@default:default,org.eclipse.papyrus.infra.tools@default:default,org.eclipse.papyrus.infra.types.core@default:default,org.eclipse.papyrus.infra.types.edit@default:default,org.eclipse.papyrus.infra.types.editor@default:default,org.eclipse.papyrus.infra.types.rulebased@default:default,org.eclipse.papyrus.infra.types.tests@default:default,org.eclipse.papyrus.infra.types.ui.tests@default:default,org.eclipse.papyrus.infra.types.ui@default:default,org.eclipse.papyrus.infra.types@default:default,org.eclipse.papyrus.infra.ui.emf.tests@default:default,org.eclipse.papyrus.infra.ui.emf@default:default,org.eclipse.papyrus.infra.ui.resources@default:default,org.eclipse.papyrus.infra.ui.tests@default:default,org.eclipse.papyrus.infra.ui@default:default,org.eclipse.papyrus.infra.viewpoints.configuration.tests@default:default,org.eclipse.papyrus.infra.viewpoints.policy.edit@default:default,org.eclipse.papyrus.infra.viewpoints.policy.tests@default:default,org.eclipse.papyrus.infra.viewpoints.policy@default:default,org.eclipse.papyrus.infra.widgets.toolbox@default:default,org.eclipse.papyrus.infra.widgets@default:default,org.eclipse.papyrus.junit.framework@default:default,org.eclipse.papyrus.junit.utils@default:default,org.eclipse.papyrus.mwe2.utils@default:default,org.eclipse.papyrus.releng.dev.release@default:default,org.eclipse.papyrus.releng.main.release@default:default,org.eclipse.papyrus.sdk@default:default,org.eclipse.papyrus.search.tests@default:default,org.eclipse.papyrus.sysml.architecture@default:default,org.eclipse.papyrus.sysml.diagram.blockdefinition.tests@default:default,org.eclipse.papyrus.sysml.diagram.blockdefinition@default:default,org.eclipse.papyrus.sysml.diagram.common@default:default,org.eclipse.papyrus.sysml.diagram.css@default:default,org.eclipse.papyrus.sysml.diagram.internalblock.tests@default:default,org.eclipse.papyrus.sysml.diagram.internalblock@default:default,org.eclipse.papyrus.sysml.diagram.parametric.tests@default:default,org.eclipse.papyrus.sysml.diagram.parametric@default:default,org.eclipse.papyrus.sysml.diagram.requirement.tests@default:default,org.eclipse.papyrus.sysml.diagram.requirement@default:default,org.eclipse.papyrus.sysml.diagram.ui@default:default,org.eclipse.papyrus.sysml.edit@default:default,org.eclipse.papyrus.sysml.modelexplorer.tests@default:default,org.eclipse.papyrus.sysml.modelexplorer@default:default,org.eclipse.papyrus.sysml.nattable.allocation.config@default:default,org.eclipse.papyrus.sysml.nattable.allocation.tests@default:default,org.eclipse.papyrus.sysml.nattable.allocation@default:default,org.eclipse.papyrus.sysml.nattable.menu@default:default,org.eclipse.papyrus.sysml.nattable.requirement.config@default:default,org.eclipse.papyrus.sysml.nattable.requirement.tests@default:default,org.eclipse.papyrus.sysml.nattable.requirement@default:default,org.eclipse.papyrus.sysml.nattable@default:default,org.eclipse.papyrus.sysml.properties@default:default,org.eclipse.papyrus.sysml.service.types.tests@default:default,org.eclipse.papyrus.sysml.service.types@default:default,org.eclipse.papyrus.sysml.tests@default:default,org.eclipse.papyrus.sysml@default:default,org.eclipse.papyrus.team.svn@default:default,org.eclipse.papyrus.tests.diagramassistants@default:default,org.eclipse.papyrus.tests.framework.annotations@default:default,org.eclipse.papyrus.tests.framework.edit@default:default,org.eclipse.papyrus.tests.framework.editor@default:default,org.eclipse.papyrus.tests.framework@default:default,org.eclipse.papyrus.tests@default:default,org.eclipse.papyrus.uml.alf.backend.tests@default:default,org.eclipse.papyrus.uml.alf.common.ui@default:default,org.eclipse.papyrus.uml.alf.common@default:default,org.eclipse.papyrus.uml.alf.libraries@default:default,org.eclipse.papyrus.uml.alf.tests@default:default,org.eclipse.papyrus.uml.alf.to.fuml@default:default,org.eclipse.papyrus.uml.alf.ui@default:default,org.eclipse.papyrus.uml.alf@default:default,org.eclipse.papyrus.uml.appearance@default:default,org.eclipse.papyrus.uml.architecture@default:default,org.eclipse.papyrus.uml.commands@default:default,org.eclipse.papyrus.uml.controlmode.profile@default:default,org.eclipse.papyrus.uml.decoratormodel.controlmode.tests@default:default,org.eclipse.papyrus.uml.decoratormodel.controlmode@default:default,org.eclipse.papyrus.uml.decoratormodel.properties@default:default,org.eclipse.papyrus.uml.decoratormodel.tests@default:default,org.eclipse.papyrus.uml.decoratormodel.ui@default:default,org.eclipse.papyrus.uml.decoratormodel@default:default,org.eclipse.papyrus.uml.developer.mde@default:default,org.eclipse.papyrus.uml.diagram.activity.tests@default:default,org.eclipse.papyrus.uml.diagram.activity@default:default,org.eclipse.papyrus.uml.diagram.clazz.tests@default:default,org.eclipse.papyrus.uml.diagram.clazz@default:default,org.eclipse.papyrus.uml.diagram.common.groups@default:default,org.eclipse.papyrus.uml.diagram.common.palette.customaction@default:default,org.eclipse.papyrus.uml.diagram.common.tests@default:default,org.eclipse.papyrus.uml.diagram.common@default:default,org.eclipse.papyrus.uml.diagram.communication.tests@default:default,org.eclipse.papyrus.uml.diagram.communication@default:default,org.eclipse.papyrus.uml.diagram.component.tests@default:default,org.eclipse.papyrus.uml.diagram.component@default:default,org.eclipse.papyrus.uml.diagram.composite.tests@default:default,org.eclipse.papyrus.uml.diagram.composite@default:default,org.eclipse.papyrus.uml.diagram.css.palette@default:default,org.eclipse.papyrus.uml.diagram.css@default:default,org.eclipse.papyrus.uml.diagram.deployment.tests@default:default,org.eclipse.papyrus.uml.diagram.deployment@default:default,org.eclipse.papyrus.uml.diagram.dnd.tests@default:default,org.eclipse.papyrus.uml.diagram.dnd@default:default,org.eclipse.papyrus.uml.diagram.icons@default:default,org.eclipse.papyrus.uml.diagram.interactionoverview.tests@default:default,org.eclipse.papyrus.uml.diagram.interactionoverview@default:default,org.eclipse.papyrus.uml.diagram.linklf@default:default,org.eclipse.papyrus.uml.diagram.menu@default:default,org.eclipse.papyrus.uml.diagram.modelexplorer@default:default,org.eclipse.papyrus.uml.diagram.navigation@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration.editor@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration@default:default,org.eclipse.papyrus.uml.diagram.profile.tests@default:default,org.eclipse.papyrus.uml.diagram.profile@default:default,org.eclipse.papyrus.uml.diagram.sequence.tests@default:default,org.eclipse.papyrus.uml.diagram.sequence@default:default,org.eclipse.papyrus.uml.diagram.statemachine.tests@default:default,org.eclipse.papyrus.uml.diagram.statemachine@default:default,org.eclipse.papyrus.uml.diagram.stereotype.edition@default:default,org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests@default:default,org.eclipse.papyrus.uml.diagram.symbols.properties@default:default,org.eclipse.papyrus.uml.diagram.symbols@default:default,org.eclipse.papyrus.uml.diagram.tests@default:default,org.eclipse.papyrus.uml.diagram.timing.tests@default:default,org.eclipse.papyrus.uml.diagram.timing@default:default,org.eclipse.papyrus.uml.diagram.usecase.tests@default:default,org.eclipse.papyrus.uml.diagram.usecase@default:default,org.eclipse.papyrus.uml.diagram.wizards.tests@default:default,org.eclipse.papyrus.uml.diagram.wizards@default:default,org.eclipse.papyrus.uml.documentation.profile@default:default,org.eclipse.papyrus.uml.dynamic.profile.tests@default:default,org.eclipse.papyrus.uml.extensionpoints@default:default,org.eclipse.papyrus.uml.filters.edit@default:default,org.eclipse.papyrus.uml.filters.tests@default:default,org.eclipse.papyrus.uml.filters@default:default,org.eclipse.papyrus.uml.icons@default:default,org.eclipse.papyrus.uml.import@default:default,org.eclipse.papyrus.uml.internationalization.controlmode.tests@default:default,org.eclipse.papyrus.uml.internationalization.edit@default:default,org.eclipse.papyrus.uml.internationalization.tests@default:default,org.eclipse.papyrus.uml.internationalization.utils@default:default,org.eclipse.papyrus.uml.internationalization@default:default,org.eclipse.papyrus.uml.modelexplorer.tests@default:default,org.eclipse.papyrus.uml.modelexplorer.widgets@default:default,org.eclipse.papyrus.uml.modelexplorer@default:default,org.eclipse.papyrus.uml.modelrepair.tests@default:default,org.eclipse.papyrus.uml.modelrepair@default:default,org.eclipse.papyrus.uml.nattable.clazz.config.tests@default:default,org.eclipse.papyrus.uml.nattable.clazz.config@default:default,org.eclipse.papyrus.uml.nattable.generic.config@default:default,org.eclipse.papyrus.uml.nattable.generic.tests@default:default,org.eclipse.papyrus.uml.nattable.generic@default:default,org.eclipse.papyrus.uml.nattable.menu@default:default,org.eclipse.papyrus.uml.nattable.richtext@default:default,org.eclipse.papyrus.uml.nattable.stereotype.display.tests@default:default,org.eclipse.papyrus.uml.nattable.stereotype.display@default:default,org.eclipse.papyrus.uml.nattable.tests@default:default,org.eclipse.papyrus.uml.nattable.xtext.integration@default:default,org.eclipse.papyrus.uml.nattable.xtext.valuespecification@default:default,org.eclipse.papyrus.uml.nattable@default:default,org.eclipse.papyrus.uml.navigation@default:default,org.eclipse.papyrus.uml.perspective@default:default,org.eclipse.papyrus.uml.profile.assistants.generator.tests@default:default,org.eclipse.papyrus.uml.profile.assistants.generator.ui@default:default,org.eclipse.papyrus.uml.profile.assistants.generator@default:default,org.eclipse.papyrus.uml.profile.drafter.documentation@default:default,org.eclipse.papyrus.uml.profile.drafter.tests@default:default,org.eclipse.papyrus.uml.profile.drafter@default:default,org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui@default:default,org.eclipse.papyrus.uml.profile.newchildmenu.generator@default:default,org.eclipse.papyrus.uml.profile.tests@default:default,org.eclipse.papyrus.uml.profile.types.generator.tests@default:default,org.eclipse.papyrus.uml.profile.types.generator.ui@default:default,org.eclipse.papyrus.uml.profile.types.generator@default:default,org.eclipse.papyrus.uml.profile@default:default,org.eclipse.papyrus.uml.properties.xtext@default:default,org.eclipse.papyrus.uml.properties@default:default,org.eclipse.papyrus.uml.resourceloading.profile@default:default,org.eclipse.papyrus.uml.search.ui@default:default,org.eclipse.papyrus.uml.service.types.tests@default:default,org.eclipse.papyrus.uml.service.types.ui.tests@default:default,org.eclipse.papyrus.uml.service.types.ui@default:default,org.eclipse.papyrus.uml.service.types@default:default,org.eclipse.papyrus.uml.service.validation@default:default,org.eclipse.papyrus.uml.services.decoration@default:default,org.eclipse.papyrus.uml.templaterepository@default:default,org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.collaborationuse.xtext@default:default,org.eclipse.papyrus.uml.textedit.common.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.common.xtext@default:default,org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext@default:default,org.eclipse.papyrus.uml.textedit.javaconstraint@default:default,org.eclipse.papyrus.uml.textedit.message.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.message.xtext@default:default,org.eclipse.papyrus.uml.textedit.parameter.tests@default:default,org.eclipse.papyrus.uml.textedit.parameter.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.parameter.xtext@default:default,org.eclipse.papyrus.uml.textedit.port.tests@default:default,org.eclipse.papyrus.uml.textedit.port.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.port.xtext@default:default,org.eclipse.papyrus.uml.textedit.property.tests@default:default,org.eclipse.papyrus.uml.textedit.property.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.property.xtext@default:default,org.eclipse.papyrus.uml.textedit.state.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.state.xtext@default:default,org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext@default:default,org.eclipse.papyrus.uml.textedit.tests@default:default,org.eclipse.papyrus.uml.textedit.transition.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.transition.xtext@default:default,org.eclipse.papyrus.uml.textedit.valuespecification.tests@default:default,org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils@default:default,org.eclipse.papyrus.uml.textedit.valuespecification.xtext@default:default,org.eclipse.papyrus.uml.tools.tests@default:default,org.eclipse.papyrus.uml.tools.utils.tests@default:default,org.eclipse.papyrus.uml.tools.utils@default:default,org.eclipse.papyrus.uml.tools@default:default,org.eclipse.papyrus.uml.types.core@default:default,org.eclipse.papyrus.uml.types.ui.properties@default:default,org.eclipse.papyrus.uml.ui@default:default,org.eclipse.papyrus.uml.validation.tests.genvalidation@default:default,org.eclipse.papyrus.uml.validation.tests.staticprofile@default:default,org.eclipse.papyrus.uml.validation.tests@default:default,org.eclipse.papyrus.uml.xtext.integration.core@default:default,org.eclipse.papyrus.uml.xtext.integration.ui@default:default,org.eclipse.papyrus.uml.xtext.integration.validation@default:default,org.eclipse.papyrus.views.documentation@default:default,org.eclipse.papyrus.views.modelexplorer.newchild@default:default,org.eclipse.papyrus.views.modelexplorer.resourceloading@default:default,org.eclipse.papyrus.views.modelexplorer.tests@default:default,org.eclipse.papyrus.views.modelexplorer.widgets@default:default,org.eclipse.papyrus.views.modelexplorer@default:default,org.eclipse.papyrus.views.properties@default:default,org.eclipse.papyrus.views.references@default:default,org.eclipse.papyrus.views.search@default:default,org.eclipse.papyrus.views.validation@default:default"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/org.eclipse.papyrus.uml.diagram.profile.tests.launch b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/org.eclipse.papyrus.uml.diagram.profile.tests.launch
index b9ce61972c5..de40738fc0c 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/org.eclipse.papyrus.uml.diagram.profile.tests.launch
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile.tests/org.eclipse.papyrus.uml.diagram.profile.tests.launch
@@ -10,7 +10,7 @@
 <booleanAttribute key="clearws" value="true"/>
 <booleanAttribute key="clearwslog" value="false"/>
 <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
-<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="default" value="false"/>
 <booleanAttribute key="includeOptional" value="true"/>
 <stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
@@ -33,6 +33,8 @@
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.eclipse.platform.ide"/>
 <booleanAttribute key="run_in_ui_thread" value="true"/>
+<stringAttribute key="selected_target_plugins" value="ca.odell.glazedlists@default:default,ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.google.gerrit.common@default:default,com.google.gerrit.prettify@default:default,com.google.gerrit.reviewdb@default:default,com.google.gson@default:default,com.google.guava@default:default,com.google.gwt.servlet@default:default,com.google.gwtjsonrpc@default:default,com.google.gwtorm@default:default,com.google.inject.multibindings@default:false,com.google.inject@default:default,com.gradleware.tooling.client@default:default,com.gradleware.tooling.model@default:default,com.gradleware.tooling.utils@default:default,com.ibm.icu@default:default,com.jcraft.jsch@default:default,com.sun.el@default:default,fr.obeo.releng.targetplatform.ui@default:default,fr.obeo.releng.targetplatform@default:default,javaewah@default:default,javax.annotation@default:default,javax.el@default:default,javax.inject@default:default,javax.servlet*3.0.0.v201112011016@default:default,javax.servlet*3.1.0.v201410161800@default:default,javax.servlet.jsp@default:default,javax.xml@default:default,lpg.runtime.java@default:default,net.sourceforge.nattable.core@default:default,org.antlr.runtime*3.2.0.v201101311130@default:default,org.antlr.runtime*4.3.0.v201502022030@default:default,org.apache.ant@default:default,org.apache.batik.bridge@default:default,org.apache.batik.css*1.6.0.v201011041432@default:default,org.apache.batik.css*1.7.0.v201011041433@default:default,org.apache.batik.dom.svg@default:default,org.apache.batik.dom@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.parser@default:default,org.apache.batik.pdf@default:default,org.apache.batik.svggen@default:default,org.apache.batik.transcoder@default:default,org.apache.batik.util*1.6.0.v201011041432@default:default,org.apache.batik.util*1.7.0.v201011041433@default:default,org.apache.batik.util.gui*1.6.0.v201011041432@default:default,org.apache.batik.util.gui*1.7.0.v200903091627@default:default,org.apache.batik.xml@default:default,org.apache.commons.cli@default:default,org.apache.commons.codec@default:default,org.apache.commons.compress@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.io@default:default,org.apache.commons.jxpath@default:default,org.apache.commons.lang3@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.commons.math@default:default,org.apache.commons.pool@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.httpcomponents.httpclient*4.3.6.v201411290715@default:default,org.apache.httpcomponents.httpclient*4.3.6.v201511171540@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.jasper.glassfish@default:default,org.apache.log4j@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.apache.solr.client.solrj@default:default,org.apache.ws.commons.util@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.apache.xmlrpc@default:default,org.eclipse.acceleo.annotations@default:default,org.eclipse.acceleo.common.ide@default:default,org.eclipse.acceleo.common.ui@default:default,org.eclipse.acceleo.common@default:default,org.eclipse.acceleo.engine@default:default,org.eclipse.acceleo.ide.ui@default:default,org.eclipse.acceleo.model@default:default,org.eclipse.acceleo.parser@default:default,org.eclipse.acceleo.profiler@default:default,org.eclipse.acceleo.query@default:default,org.eclipse.acceleo.traceability.model@default:default,org.eclipse.acceleo.traceability@default:default,org.eclipse.acceleo.ui.interpreter@default:default,org.eclipse.aether.api@default:default,org.eclipse.aether.connector.basic@default:default,org.eclipse.aether.impl@default:default,org.eclipse.aether.maven@default:default,org.eclipse.aether.spi@default:default,org.eclipse.aether.transport.file@default:default,org.eclipse.aether.transport.http@default:default,org.eclipse.aether.util@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.b3.aggregator.edit@default:default,org.eclipse.b3.aggregator.editor@default:default,org.eclipse.b3.aggregator.engine.maven@default:default,org.eclipse.b3.aggregator.engine@default:default,org.eclipse.b3.aggregator.legacy.ui@default:default,org.eclipse.b3.aggregator.legacy@default:default,org.eclipse.b3.aggregator@default:default,org.eclipse.b3.cli@default:default,org.eclipse.b3.p2.edit@default:default,org.eclipse.b3.p2.maven.indexer@default:default,org.eclipse.b3.p2.maven@default:default,org.eclipse.b3.p2@default:default,org.eclipse.b3.util@default:default,org.eclipse.buckminster.osgi.filter@default:default,org.eclipse.buildship.branding@default:default,org.eclipse.buildship.core@default:default,org.eclipse.buildship.stsmigration@default:default,org.eclipse.buildship.ui@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.cvs@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.draw2d.doc.isv@default:default,org.eclipse.draw2d@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.emf.xpath@default:default,org.eclipse.e4.tools.compat@default:default,org.eclipse.e4.tools.emf.editor3x@default:default,org.eclipse.e4.tools.emf.ui@default:default,org.eclipse.e4.tools.jdt.templates@default:default,org.eclipse.e4.tools.services@default:default,org.eclipse.e4.tools@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.dialogs@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt.cocoa@default:false,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.httpclient4.ssl@default:false,org.eclipse.ecf.provider.filetransfer.httpclient4@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.eef.common.ui@default:default,org.eclipse.eef.common@default:default,org.eclipse.eef.core.ext.widgets.reference@default:default,org.eclipse.eef.core@default:default,org.eclipse.eef.ext.widgets.reference@default:default,org.eclipse.eef.ide.ui.ext.widgets.reference@default:default,org.eclipse.eef.ide.ui.properties@default:default,org.eclipse.eef.ide.ui@default:default,org.eclipse.eef.ide@default:default,org.eclipse.eef.properties.ui.legacy@default:default,org.eclipse.eef.properties.ui@default:default,org.eclipse.eef@default:default,org.eclipse.egit.core@default:default,org.eclipse.egit.doc@default:default,org.eclipse.egit.mylyn.ui@default:default,org.eclipse.egit.ui@default:default,org.eclipse.egit@default:default,org.eclipse.emf.ant@default:default,org.eclipse.emf.cdo.admin@default:default,org.eclipse.emf.cdo.common.db@default:default,org.eclipse.emf.cdo.common@default:default,org.eclipse.emf.cdo.compare@default:default,org.eclipse.emf.cdo.defs@default:default,org.eclipse.emf.cdo.doc@default:default,org.eclipse.emf.cdo.ecore.retrofit@default:false,org.eclipse.emf.cdo.edit@default:default,org.eclipse.emf.cdo.examples.installer@default:default,org.eclipse.emf.cdo.explorer.ui@default:default,org.eclipse.emf.cdo.explorer@default:default,org.eclipse.emf.cdo.expressions.edit@default:default,org.eclipse.emf.cdo.expressions.editor@default:default,org.eclipse.emf.cdo.expressions@default:default,org.eclipse.emf.cdo.migrator@default:default,org.eclipse.emf.cdo.net4j@default:default,org.eclipse.emf.cdo.sdk@default:default,org.eclipse.emf.cdo.security.edit@default:default,org.eclipse.emf.cdo.security.editor@default:default,org.eclipse.emf.cdo.security.ui@default:default,org.eclipse.emf.cdo.security@default:default,org.eclipse.emf.cdo.server.admin@default:default,org.eclipse.emf.cdo.server.db@default:default,org.eclipse.emf.cdo.server.lissome@default:default,org.eclipse.emf.cdo.server.mongodb@default:default,org.eclipse.emf.cdo.server.net4j@default:default,org.eclipse.emf.cdo.server.ocl@default:default,org.eclipse.emf.cdo.server.product@default:default,org.eclipse.emf.cdo.server.security@default:default,org.eclipse.emf.cdo.server@default:default,org.eclipse.emf.cdo.transfer.repository@default:default,org.eclipse.emf.cdo.transfer.ui@default:default,org.eclipse.emf.cdo.transfer.workspace.ui@default:default,org.eclipse.emf.cdo.transfer.workspace@default:default,org.eclipse.emf.cdo.transfer@default:default,org.eclipse.emf.cdo.ui.admin@default:default,org.eclipse.emf.cdo.ui.compare@default:default,org.eclipse.emf.cdo.ui.defs@default:default,org.eclipse.emf.cdo.ui.shared@default:default,org.eclipse.emf.cdo.ui.team@default:default,org.eclipse.emf.cdo.ui@default:default,org.eclipse.emf.cdo.workspace@default:default,org.eclipse.emf.cdo@default:default,org.eclipse.emf.cheatsheets@default:default,org.eclipse.emf.codegen.ecore.ui@default:default,org.eclipse.emf.codegen.ecore.xtext@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.codegen.ui@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.compare.diagram.edit@default:default,org.eclipse.emf.compare.diagram.ide.ui.papyrus@default:default,org.eclipse.emf.compare.diagram.ide.ui@default:default,org.eclipse.emf.compare.diagram.papyrus@default:default,org.eclipse.emf.compare.diagram@default:default,org.eclipse.emf.compare.doc@default:default,org.eclipse.emf.compare.edit@default:default,org.eclipse.emf.compare.egit.ui@default:default,org.eclipse.emf.compare.egit@default:default,org.eclipse.emf.compare.ide.ui@default:default,org.eclipse.emf.compare.ide@default:default,org.eclipse.emf.compare.rcp.ui@default:default,org.eclipse.emf.compare.rcp@default:default,org.eclipse.emf.compare.uml2.edit.papyrus@default:default,org.eclipse.emf.compare.uml2.edit@default:default,org.eclipse.emf.compare.uml2.rcp.ui@default:default,org.eclipse.emf.compare.uml2.rcp@default:default,org.eclipse.emf.compare.uml2@default:default,org.eclipse.emf.compare@default:default,org.eclipse.emf.converter@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.doc@default:default,org.eclipse.emf.ecore.change.edit@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.emf.ecore.xcore.lib@default:default,org.eclipse.emf.ecore.xcore@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.eef.runtime@default:default,org.eclipse.emf.example.installer@default:default,org.eclipse.emf.examples.library@default:default,org.eclipse.emf.exporter@default:default,org.eclipse.emf.facet.aggregate.doc@default:default,org.eclipse.emf.facet.aggregate.metamodel.notgenerated@default:default,org.eclipse.emf.facet.aggregate.metamodel@default:default,org.eclipse.emf.facet.capabilities@default:default,org.eclipse.emf.facet.common.core@default:default,org.eclipse.emf.facet.common.sdk.core@default:default,org.eclipse.emf.facet.common.sdk.ui@default:default,org.eclipse.emf.facet.common.ui@default:default,org.eclipse.emf.facet.custom.core@default:default,org.eclipse.emf.facet.custom.doc@default:default,org.eclipse.emf.facet.custom.metamodel.edit@default:default,org.eclipse.emf.facet.custom.metamodel.editor@default:default,org.eclipse.emf.facet.custom.metamodel@default:default,org.eclipse.emf.facet.custom.sdk.core@default:default,org.eclipse.emf.facet.custom.sdk.ui@default:default,org.eclipse.emf.facet.custom.ui@default:default,org.eclipse.emf.facet.doc@default:default,org.eclipse.emf.facet.ecore@default:default,org.eclipse.emf.facet.efacet.core@default:default,org.eclipse.emf.facet.efacet.doc@default:default,org.eclipse.emf.facet.efacet.examples.library.core@default:default,org.eclipse.emf.facet.efacet.examples.library.metamodel.edit@default:default,org.eclipse.emf.facet.efacet.examples.library.metamodel@default:default,org.eclipse.emf.facet.efacet.metamodel.edit@default:default,org.eclipse.emf.facet.efacet.metamodel.editor@default:default,org.eclipse.emf.facet.efacet.metamodel@default:default,org.eclipse.emf.facet.efacet.sdk.ui@default:default,org.eclipse.emf.facet.efacet.ui@default:default,org.eclipse.emf.facet.query.java.core@default:default,org.eclipse.emf.facet.query.java.metamodel@default:default,org.eclipse.emf.facet.query.java.sdk.ui@default:default,org.eclipse.emf.facet.query.java.ui@default:default,org.eclipse.emf.facet.query.ocl.core@default:default,org.eclipse.emf.facet.query.ocl.metamodel@default:default,org.eclipse.emf.facet.query.ocl.sdk.ui@default:default,org.eclipse.emf.facet.util.core@default:default,org.eclipse.emf.facet.util.emf.catalog@default:default,org.eclipse.emf.facet.util.emf.core@default:default,org.eclipse.emf.facet.util.emf.doc@default:default,org.eclipse.emf.facet.util.emf.ui@default:default,org.eclipse.emf.facet.util.jface.ui@default:default,org.eclipse.emf.facet.util.junit.core@default:default,org.eclipse.emf.facet.util.pde.core@default:default,org.eclipse.emf.facet.util.swt@default:default,org.eclipse.emf.facet.util.ui@default:default,org.eclipse.emf.facet.widgets.celleditors.ecore.tests.samplemm@default:default,org.eclipse.emf.facet.widgets.celleditors.ecore@default:default,org.eclipse.emf.facet.widgets.celleditors.edit@default:default,org.eclipse.emf.facet.widgets.celleditors.editor@default:default,org.eclipse.emf.facet.widgets.celleditors@default:default,org.eclipse.emf.facet.widgets.table.doc@default:default,org.eclipse.emf.facet.widgets.table.examples.library.core@default:default,org.eclipse.emf.facet.widgets.table.metamodel.edit@default:default,org.eclipse.emf.facet.widgets.table.metamodel@default:default,org.eclipse.emf.facet.widgets.table.ui.nattable@default:default,org.eclipse.emf.facet.widgets.table.ui.workbench@default:default,org.eclipse.emf.facet.widgets.table.ui@default:default,org.eclipse.emf.facet.widgets@default:default,org.eclipse.emf.importer.ecore@default:default,org.eclipse.emf.importer.java@default:default,org.eclipse.emf.importer.rose@default:default,org.eclipse.emf.importer@default:default,org.eclipse.emf.mapping.ecore.editor@default:default,org.eclipse.emf.mapping.ecore2ecore.editor@default:default,org.eclipse.emf.mapping.ecore2ecore@default:default,org.eclipse.emf.mapping.ecore2xml.ui@default:default,org.eclipse.emf.mapping.ecore2xml@default:default,org.eclipse.emf.mapping.ecore@default:default,org.eclipse.emf.mapping.ui@default:default,org.eclipse.emf.mapping@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.emf.mwe2.language.ui@default:default,org.eclipse.emf.mwe2.language@default:default,org.eclipse.emf.mwe2.launch.ui@default:default,org.eclipse.emf.mwe2.launch@default:default,org.eclipse.emf.mwe2.lib@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.emf.query.doc@default:default,org.eclipse.emf.query.examples@default:default,org.eclipse.emf.query.ocl@default:default,org.eclipse.emf.query@default:default,org.eclipse.emf.transaction.doc@default:default,org.eclipse.emf.transaction.examples@default:default,org.eclipse.emf.transaction.ui@default:default,org.eclipse.emf.transaction@default:default,org.eclipse.emf.validation.doc@default:default,org.eclipse.emf.validation.examples@default:default,org.eclipse.emf.validation.ocl@default:default,org.eclipse.emf.validation.ui.ide@default:default,org.eclipse.emf.validation.ui@default:default,org.eclipse.emf.validation@default:default,org.eclipse.emf.workspace.doc@default:default,org.eclipse.emf.workspace.ui@default:default,org.eclipse.emf.workspace@default:default,org.eclipse.emf@default:default,org.eclipse.epp.logging.aeri.core@default:default,org.eclipse.epp.logging.aeri.ide@default:default,org.eclipse.epp.mpc.core@default:default,org.eclipse.epp.mpc.help.ui@default:default,org.eclipse.epp.mpc.ui@default:default,org.eclipse.epp.package.committers@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.equinox.launcher.cocoa.macosx.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.equinox.p2.discovery.compatibility@default:default,org.eclipse.equinox.p2.discovery@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,org.eclipse.equinox.p2.ui.discovery@default:default,org.eclipse.equinox.p2.ui.importexport@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.macosx@default:false,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.gef.doc.isv@default:default,org.eclipse.gef.examples.ui.pde@default:default,org.eclipse.gef@default:default,org.eclipse.gmf.bridge.trace@default:default,org.eclipse.gmf.bridge.ui.dashboard@default:default,org.eclipse.gmf.bridge.ui@default:default,org.eclipse.gmf.bridge@default:default,org.eclipse.gmf.codegen.edit@default:default,org.eclipse.gmf.codegen.ui@default:default,org.eclipse.gmf.codegen.xtend.ui@default:default,org.eclipse.gmf.codegen.xtend@default:default,org.eclipse.gmf.codegen@default:default,org.eclipse.gmf.common@default:default,org.eclipse.gmf.doc.ui@default:default,org.eclipse.gmf.doc@default:default,org.eclipse.gmf.ecore.editor@default:default,org.eclipse.gmf.examples.runtime.diagram.geoshapes@default:default,org.eclipse.gmf.examples.runtime.diagram.logic.model.edit@default:default,org.eclipse.gmf.examples.runtime.diagram.logic.model.editor@default:default,org.eclipse.gmf.examples.runtime.diagram.logic.model@default:default,org.eclipse.gmf.examples.runtime.diagram.logic@default:default,org.eclipse.gmf.examples.runtime.ui.pde@default:default,org.eclipse.gmf.examples.runtime@default:default,org.eclipse.gmf.graphdef.codegen.ui@default:default,org.eclipse.gmf.graphdef.codegen@default:default,org.eclipse.gmf.graphdef.edit@default:default,org.eclipse.gmf.graphdef@default:default,org.eclipse.gmf.map.edit@default:default,org.eclipse.gmf.map@default:default,org.eclipse.gmf.runtime.common.core@default:default,org.eclipse.gmf.runtime.common.ui.action.ide@default:default,org.eclipse.gmf.runtime.common.ui.action@default:default,org.eclipse.gmf.runtime.common.ui.printing.win32@default:false,org.eclipse.gmf.runtime.common.ui.printing@default:default,org.eclipse.gmf.runtime.common.ui.services.action@default:default,org.eclipse.gmf.runtime.common.ui.services.dnd.ide@default:default,org.eclipse.gmf.runtime.common.ui.services.dnd@default:default,org.eclipse.gmf.runtime.common.ui.services.properties@default:default,org.eclipse.gmf.runtime.common.ui.services@default:default,org.eclipse.gmf.runtime.common.ui@default:default,org.eclipse.gmf.runtime.diagram.core@default:default,org.eclipse.gmf.runtime.diagram.ui.actions@default:default,org.eclipse.gmf.runtime.diagram.ui.dnd@default:default,org.eclipse.gmf.runtime.diagram.ui.geoshapes@default:default,org.eclipse.gmf.runtime.diagram.ui.printing.render@default:default,org.eclipse.gmf.runtime.diagram.ui.printing@default:default,org.eclipse.gmf.runtime.diagram.ui.properties@default:default,org.eclipse.gmf.runtime.diagram.ui.providers.ide@default:default,org.eclipse.gmf.runtime.diagram.ui.providers@default:default,org.eclipse.gmf.runtime.diagram.ui.render@default:default,org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide@default:default,org.eclipse.gmf.runtime.diagram.ui.resources.editor@default:default,org.eclipse.gmf.runtime.diagram.ui@default:default,org.eclipse.gmf.runtime.draw2d.ui.render.awt@default:default,org.eclipse.gmf.runtime.draw2d.ui.render@default:default,org.eclipse.gmf.runtime.draw2d.ui@default:default,org.eclipse.gmf.runtime.emf.clipboard.core@default:default,org.eclipse.gmf.runtime.emf.commands.core@default:default,org.eclipse.gmf.runtime.emf.core@default:default,org.eclipse.gmf.runtime.emf.type.core@default:default,org.eclipse.gmf.runtime.emf.type.ui@default:default,org.eclipse.gmf.runtime.emf.ui.properties@default:default,org.eclipse.gmf.runtime.emf.ui@default:default,org.eclipse.gmf.runtime.gef.ui@default:default,org.eclipse.gmf.runtime.lite.svg@default:default,org.eclipse.gmf.runtime.notation.edit@default:default,org.eclipse.gmf.runtime.notation.providers@default:default,org.eclipse.gmf.runtime.notation.sdk@default:default,org.eclipse.gmf.runtime.notation@default:default,org.eclipse.gmf.runtime.sdk@default:default,org.eclipse.gmf.sdk@default:default,org.eclipse.gmf.tooldef.edit@default:default,org.eclipse.gmf.tooldef@default:default,org.eclipse.gmf.tooling.runtime@default:default,org.eclipse.gmf.tooling@default:default,org.eclipse.gmf.validate@default:default,org.eclipse.gmf.xpand.editor@default:default,org.eclipse.gmf.xpand.qvtlibrary@default:default,org.eclipse.gmf.xpand@default:default,org.eclipse.gmf@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help.webapp@default:default,org.eclipse.help@default:default,org.eclipse.jdt.annotation*1.1.100.v20160418-1457@default:default,org.eclipse.jdt.annotation*2.1.0.v20160418-1457@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.doc.isv@default:default,org.eclipse.jdt.doc.user@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching.macosx@default:default,org.eclipse.jdt.launching.ui.macosx@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt@default:default,org.eclipse.jem.util@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.jgit.archive@default:default,org.eclipse.jgit.http.apache@default:default,org.eclipse.jgit@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.m2e.archetype.common@default:default,org.eclipse.m2e.core.ui@default:default,org.eclipse.m2e.core@default:default,org.eclipse.m2e.discovery@default:default,org.eclipse.m2e.editor.xml@default:default,org.eclipse.m2e.editor@default:default,org.eclipse.m2e.importer@default:default,org.eclipse.m2e.jdt.ui@default:false,org.eclipse.m2e.jdt@default:default,org.eclipse.m2e.launching@default:default,org.eclipse.m2e.lifecyclemapping.defaults@default:default,org.eclipse.m2e.maven.indexer@default:default,org.eclipse.m2e.maven.runtime.slf4j.simple@default:default,org.eclipse.m2e.maven.runtime@default:default,org.eclipse.m2e.model.edit@default:default,org.eclipse.m2e.profiles.core@default:default,org.eclipse.m2e.profiles.ui@default:default,org.eclipse.m2e.refactoring@default:default,org.eclipse.m2e.scm@default:default,org.eclipse.m2e.workspace.cli@default:default,org.eclipse.m2m.qvt.oml.common.ui@default:default,org.eclipse.m2m.qvt.oml.common@default:default,org.eclipse.m2m.qvt.oml.cst.parser@default:default,org.eclipse.m2m.qvt.oml.debug.core@default:default,org.eclipse.m2m.qvt.oml.debug.ui@default:default,org.eclipse.m2m.qvt.oml.doc@default:default,org.eclipse.m2m.qvt.oml.ecore.imperativeocl@default:default,org.eclipse.m2m.qvt.oml.editor.ui@default:default,org.eclipse.m2m.qvt.oml.emf.util.ui@default:default,org.eclipse.m2m.qvt.oml.emf.util@default:default,org.eclipse.m2m.qvt.oml.ocl@default:default,org.eclipse.m2m.qvt.oml.project@default:default,org.eclipse.m2m.qvt.oml.runtime.jdt@default:default,org.eclipse.m2m.qvt.oml.runtime.ui@default:default,org.eclipse.m2m.qvt.oml.runtime@default:default,org.eclipse.m2m.qvt.oml.samples@default:default,org.eclipse.m2m.qvt.oml.trace.edit@default:default,org.eclipse.m2m.qvt.oml.ui@default:default,org.eclipse.m2m.qvt.oml@default:default,org.eclipse.mylyn.bugzilla.core@default:default,org.eclipse.mylyn.bugzilla.ui@default:default,org.eclipse.mylyn.builds.core@default:default,org.eclipse.mylyn.builds.ui@default:default,org.eclipse.mylyn.commons.core@default:default,org.eclipse.mylyn.commons.identity.core@default:default,org.eclipse.mylyn.commons.net@default:default,org.eclipse.mylyn.commons.notifications.core@default:default,org.eclipse.mylyn.commons.notifications.feed@default:default,org.eclipse.mylyn.commons.notifications.ui@default:default,org.eclipse.mylyn.commons.repositories.core@default:default,org.eclipse.mylyn.commons.repositories.http.core@default:default,org.eclipse.mylyn.commons.repositories.ui@default:default,org.eclipse.mylyn.commons.screenshots@default:default,org.eclipse.mylyn.commons.ui@default:default,org.eclipse.mylyn.commons.workbench@default:default,org.eclipse.mylyn.commons.xmlrpc@default:default,org.eclipse.mylyn.context.core@default:default,org.eclipse.mylyn.context.tasks.ui@default:default,org.eclipse.mylyn.context.ui@default:default,org.eclipse.mylyn.debug.ui@default:default,org.eclipse.mylyn.discovery.core@default:default,org.eclipse.mylyn.discovery.ui@default:default,org.eclipse.mylyn.gerrit.core@default:default,org.eclipse.mylyn.gerrit.dashboard.core@default:default,org.eclipse.mylyn.gerrit.dashboard.ui@default:default,org.eclipse.mylyn.gerrit.ui@default:default,org.eclipse.mylyn.git.core@default:default,org.eclipse.mylyn.git.ui@default:default,org.eclipse.mylyn.hudson.core@default:default,org.eclipse.mylyn.hudson.ui@default:default,org.eclipse.mylyn.ide.ant@default:default,org.eclipse.mylyn.ide.ui@default:default,org.eclipse.mylyn.java.tasks@default:default,org.eclipse.mylyn.java.ui@default:default,org.eclipse.mylyn.monitor.core@default:default,org.eclipse.mylyn.monitor.ui@default:default,org.eclipse.mylyn.resources.ui@default:default,org.eclipse.mylyn.reviews.core@default:default,org.eclipse.mylyn.reviews.edit@default:default,org.eclipse.mylyn.reviews.ui@default:default,org.eclipse.mylyn.tasks.core@default:default,org.eclipse.mylyn.tasks.index.core@default:default,org.eclipse.mylyn.tasks.index.ui@default:default,org.eclipse.mylyn.tasks.search@default:default,org.eclipse.mylyn.tasks.ui@default:default,org.eclipse.mylyn.team.ui@default:default,org.eclipse.mylyn.versions.core@default:default,org.eclipse.mylyn.versions.ui@default:default,org.eclipse.mylyn.wikitext.asciidoc.core@default:default,org.eclipse.mylyn.wikitext.asciidoc.ui@default:default,org.eclipse.mylyn.wikitext.confluence.core@default:default,org.eclipse.mylyn.wikitext.confluence.ui@default:default,org.eclipse.mylyn.wikitext.context.ui@default:default,org.eclipse.mylyn.wikitext.core.ant@default:default,org.eclipse.mylyn.wikitext.core.osgi@default:default,org.eclipse.mylyn.wikitext.core@default:default,org.eclipse.mylyn.wikitext.help.ui@default:default,org.eclipse.mylyn.wikitext.html.core@default:default,org.eclipse.mylyn.wikitext.markdown.core@default:default,org.eclipse.mylyn.wikitext.markdown.ui@default:default,org.eclipse.mylyn.wikitext.mediawiki.core.ant@default:default,org.eclipse.mylyn.wikitext.mediawiki.core@default:default,org.eclipse.mylyn.wikitext.mediawiki.ui@default:default,org.eclipse.mylyn.wikitext.tasks.ui@default:default,org.eclipse.mylyn.wikitext.textile.core@default:default,org.eclipse.mylyn.wikitext.textile.ui@default:default,org.eclipse.mylyn.wikitext.tracwiki.core@default:default,org.eclipse.mylyn.wikitext.tracwiki.ui@default:default,org.eclipse.mylyn.wikitext.twiki.core@default:default,org.eclipse.mylyn.wikitext.twiki.ui@default:default,org.eclipse.mylyn.wikitext.ui@default:default,org.eclipse.nebula.widgets.nattable.core@default:default,org.eclipse.nebula.widgets.nattable.extension.glazedlists@default:default,org.eclipse.nebula.widgets.nattable.extension.nebula@default:default,org.eclipse.nebula.widgets.richtext@default:default,org.eclipse.nebula.widgets.tablecombo@default:default,org.eclipse.net4j.db.doc@default:default,org.eclipse.net4j.db.h2@default:default,org.eclipse.net4j.db.jdbc@default:default,org.eclipse.net4j.db@default:default,org.eclipse.net4j.debug@default:default,org.eclipse.net4j.defs@default:default,org.eclipse.net4j.doc@default:default,org.eclipse.net4j.examples.installer@default:default,org.eclipse.net4j.http.common@default:default,org.eclipse.net4j.http.server@default:default,org.eclipse.net4j.http@default:default,org.eclipse.net4j.jvm@default:default,org.eclipse.net4j.sdk@default:default,org.eclipse.net4j.tcp@default:default,org.eclipse.net4j.ui.defs@default:default,org.eclipse.net4j.ui.shared@default:default,org.eclipse.net4j.ui@default:default,org.eclipse.net4j.util.defs@default:default,org.eclipse.net4j.util.doc@default:default,org.eclipse.net4j.util.ui@default:default,org.eclipse.net4j.util@default:default,org.eclipse.net4j@default:default,org.eclipse.ocl.common.ui@default:default,org.eclipse.ocl.common@default:default,org.eclipse.ocl.doc@default:default,org.eclipse.ocl.ecore.edit@default:default,org.eclipse.ocl.ecore.tests@default:default,org.eclipse.ocl.ecore@default:default,org.eclipse.ocl.edit@default:default,org.eclipse.ocl.examples.classic@default:default,org.eclipse.ocl.examples.codegen@default:default,org.eclipse.ocl.examples.debug.ui@default:default,org.eclipse.ocl.examples.debug.vm.ui@default:default,org.eclipse.ocl.examples.debug.vm@default:default,org.eclipse.ocl.examples.debug@default:default,org.eclipse.ocl.examples.domain@default:default,org.eclipse.ocl.examples.emf.validation.validity.ui@default:default,org.eclipse.ocl.examples.emf.validation.validity@default:default,org.eclipse.ocl.examples.eventmanager.tests@default:default,org.eclipse.ocl.examples.eventmanager@default:default,org.eclipse.ocl.examples.impactanalyzer.testmodel.company@default:default,org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm@default:default,org.eclipse.ocl.examples.impactanalyzer.tests@default:default,org.eclipse.ocl.examples.impactanalyzer.testutils@default:default,org.eclipse.ocl.examples.impactanalyzer.ui@default:default,org.eclipse.ocl.examples.impactanalyzer.util@default:default,org.eclipse.ocl.examples.impactanalyzer@default:default,org.eclipse.ocl.examples.interpreter@default:default,org.eclipse.ocl.examples.library@default:default,org.eclipse.ocl.examples.pivot@default:default,org.eclipse.ocl.examples.standalone@default:default,org.eclipse.ocl.examples.tests@default:default,org.eclipse.ocl.examples.testutils@default:default,org.eclipse.ocl.examples.ui@default:default,org.eclipse.ocl.examples.uml25@default:default,org.eclipse.ocl.examples.unified@default:default,org.eclipse.ocl.examples.validity.test@default:default,org.eclipse.ocl.examples.validity@default:default,org.eclipse.ocl.examples.xtext.base.ui@default:default,org.eclipse.ocl.examples.xtext.base@default:default,org.eclipse.ocl.examples.xtext.completeocl.ui@default:default,org.eclipse.ocl.examples.xtext.completeocl@default:default,org.eclipse.ocl.examples.xtext.console@default:default,org.eclipse.ocl.examples.xtext.essentialocl.ui@default:default,org.eclipse.ocl.examples.xtext.essentialocl@default:default,org.eclipse.ocl.examples.xtext.markup.ui@default:default,org.eclipse.ocl.examples.xtext.markup@default:default,org.eclipse.ocl.examples.xtext.oclinecore.ui@default:default,org.eclipse.ocl.examples.xtext.oclinecore@default:default,org.eclipse.ocl.examples.xtext.oclstdlib.ui@default:default,org.eclipse.ocl.examples.xtext.oclstdlib@default:default,org.eclipse.ocl.examples.xtext.tests@default:default,org.eclipse.ocl.examples@default:default,org.eclipse.ocl.master@default:default,org.eclipse.ocl.pivot.ui@default:default,org.eclipse.ocl.pivot.uml@default:default,org.eclipse.ocl.pivot@default:default,org.eclipse.ocl.tests@default:default,org.eclipse.ocl.ui@default:default,org.eclipse.ocl.uml.edit@default:default,org.eclipse.ocl.uml.tests@default:default,org.eclipse.ocl.uml.ui@default:default,org.eclipse.ocl.uml@default:default,org.eclipse.ocl.xtext.base.ui@default:default,org.eclipse.ocl.xtext.base@default:default,org.eclipse.ocl.xtext.completeocl.ui@default:default,org.eclipse.ocl.xtext.completeocl@default:default,org.eclipse.ocl.xtext.essentialocl.ui@default:default,org.eclipse.ocl.xtext.essentialocl@default:default,org.eclipse.ocl.xtext.markup.ui@default:default,org.eclipse.ocl.xtext.markup@default:default,org.eclipse.ocl.xtext.oclinecore.ui@default:default,org.eclipse.ocl.xtext.oclinecore@default:default,org.eclipse.ocl.xtext.oclstdlib.ui@default:default,org.eclipse.ocl.xtext.oclstdlib@default:default,org.eclipse.ocl@default:default,org.eclipse.oomph.base.edit@default:default,org.eclipse.oomph.base@default:default,org.eclipse.oomph.extractor.lib@default:default,org.eclipse.oomph.jreinfo.ui@default:default,org.eclipse.oomph.jreinfo@default:default,org.eclipse.oomph.p2.core@default:default,org.eclipse.oomph.p2.doc@default:default,org.eclipse.oomph.p2.edit@default:default,org.eclipse.oomph.p2.ui@default:default,org.eclipse.oomph.p2@default:default,org.eclipse.oomph.predicates.edit@default:default,org.eclipse.oomph.predicates@default:default,org.eclipse.oomph.preferences.edit@default:default,org.eclipse.oomph.preferences.editor@default:default,org.eclipse.oomph.preferences@default:default,org.eclipse.oomph.projectconfig.edit@default:default,org.eclipse.oomph.projectconfig.editor@default:default,org.eclipse.oomph.projectconfig@default:default,org.eclipse.oomph.resources.edit@default:default,org.eclipse.oomph.resources@default:default,org.eclipse.oomph.setup.core@default:default,org.eclipse.oomph.setup.doc@default:default,org.eclipse.oomph.setup.edit@default:default,org.eclipse.oomph.setup.editor@default:default,org.eclipse.oomph.setup.git.edit@default:default,org.eclipse.oomph.setup.git@default:default,org.eclipse.oomph.setup.jdt.edit@default:default,org.eclipse.oomph.setup.jdt@default:default,org.eclipse.oomph.setup.launching.edit@default:default,org.eclipse.oomph.setup.launching@default:default,org.eclipse.oomph.setup.maven.edit@default:default,org.eclipse.oomph.setup.maven@default:default,org.eclipse.oomph.setup.mylyn.edit@default:default,org.eclipse.oomph.setup.mylyn@default:default,org.eclipse.oomph.setup.p2.edit@default:default,org.eclipse.oomph.setup.p2@default:default,org.eclipse.oomph.setup.pde.edit@default:default,org.eclipse.oomph.setup.pde@default:default,org.eclipse.oomph.setup.projects.edit@default:default,org.eclipse.oomph.setup.projects@default:default,org.eclipse.oomph.setup.projectset.edit@default:default,org.eclipse.oomph.setup.projectset@default:default,org.eclipse.oomph.setup.sdk@default:default,org.eclipse.oomph.setup.sync@default:default,org.eclipse.oomph.setup.targlets.edit@default:default,org.eclipse.oomph.setup.targlets@default:default,org.eclipse.oomph.setup.ui.ide@default:default,org.eclipse.oomph.setup.ui.questionnaire@default:default,org.eclipse.oomph.setup.ui@default:default,org.eclipse.oomph.setup.workbench.edit@default:default,org.eclipse.oomph.setup.workbench@default:default,org.eclipse.oomph.setup.workingsets.edit@default:default,org.eclipse.oomph.setup.workingsets@default:default,org.eclipse.oomph.setup@default:default,org.eclipse.oomph.targlets.core@default:default,org.eclipse.oomph.targlets.doc@default:default,org.eclipse.oomph.targlets.edit@default:default,org.eclipse.oomph.targlets.editor@default:default,org.eclipse.oomph.targlets.ui@default:default,org.eclipse.oomph.targlets@default:default,org.eclipse.oomph.ui@default:default,org.eclipse.oomph.util.pde@default:default,org.eclipse.oomph.util@default:default,org.eclipse.oomph.version.digest@default:default,org.eclipse.oomph.version.ui@default:default,org.eclipse.oomph.version@default:default,org.eclipse.oomph.workingsets.edit@default:default,org.eclipse.oomph.workingsets.editor@default:default,org.eclipse.oomph.workingsets@default:default,org.eclipse.orbit.mongodb@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.papyrus.cdo.ui.doc@default:default,org.eclipse.papyrus.copypaste.ui.doc@default:default,org.eclipse.papyrus.dsml.validation.doc@default:default,org.eclipse.papyrus.dsml.validation@default:default,org.eclipse.papyrus.infra.doc@default:default,org.eclipse.papyrus.infra.gmfdiag.common.doc@default:default,org.eclipse.papyrus.infra.gmfdiag.css.doc@default:default,org.eclipse.papyrus.infra.nattable.doc@default:default,org.eclipse.papyrus.infra.newchild.doc@default:default,org.eclipse.papyrus.infra.services.controlmode.doc@default:default,org.eclipse.papyrus.infra.types.doc@default:default,org.eclipse.papyrus.infra.viewpoints.doc@default:default,org.eclipse.papyrus.layers.documentation@default:default,org.eclipse.papyrus.m2m.qvto@default:default,org.eclipse.papyrus.migration.rsa@default:default,org.eclipse.papyrus.req.reqif.doc@default:default,org.eclipse.papyrus.sysml14.diagram.blockdefinition@default:default,org.eclipse.papyrus.sysml14.diagram.common@default:default,org.eclipse.papyrus.sysml14.diagram.internalblock@default:default,org.eclipse.papyrus.sysml14.diagram.parametric@default:default,org.eclipse.papyrus.sysml14.diagram.requirement@default:default,org.eclipse.papyrus.sysml14.edit@default:default,org.eclipse.papyrus.sysml14.nattable.allocation@default:default,org.eclipse.papyrus.sysml14.nattable.common@default:default,org.eclipse.papyrus.sysml14.nattable.requirement@default:default,org.eclipse.papyrus.sysml14.nattable.ui@default:default,org.eclipse.papyrus.sysml14.service.types@default:default,org.eclipse.papyrus.sysml14.ui@default:default,org.eclipse.papyrus.sysml14.validation@default:default,org.eclipse.papyrus.sysml14.viewpoint@default:default,org.eclipse.papyrus.sysml14@default:default,org.eclipse.papyrus.uml.decoratormodel.doc@default:default,org.eclipse.papyrus.uml.diagram.common.doc@default:default,org.eclipse.papyrus.uml.diagram.profile.doc@default:default,org.eclipse.papyrus.uml.doc@default:default,org.eclipse.papyrus.uml.modelrepair.doc@default:default,org.eclipse.papyrus.uml.oclconstraintevaluation@default:default,org.eclipse.papyrus.uml.profile.assistants.doc@default:default,org.eclipse.papyrus.uml.search.ui.doc@default:default,org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext@default:default,org.eclipse.papyrus.views.properties.doc@default:default,org.eclipse.papyrus.views.references.doc@default:default,org.eclipse.pde.api.tools.annotations@default:default,org.eclipse.pde.api.tools.ui@default:default,org.eclipse.pde.api.tools@default:default,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.pde.ds.annotations@default:default,org.eclipse.pde.ds.core@default:default,org.eclipse.pde.ds.ui@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.pde.launching@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.pde.ua.core@default:default,org.eclipse.pde.ua.ui@default:default,org.eclipse.pde.ui.templates@default:default,org.eclipse.pde.ui@default:default,org.eclipse.pde@default:default,org.eclipse.platform.doc.isv@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.platform@default:default,org.eclipse.rcp@default:default,org.eclipse.recommenders.apidocs.rcp@default:default,org.eclipse.recommenders.apidocs@default:default,org.eclipse.recommenders.calls.rcp@default:default,org.eclipse.recommenders.calls@default:default,org.eclipse.recommenders.chain.rcp@default:default,org.eclipse.recommenders.completion.rcp@default:default,org.eclipse.recommenders.constructors.rcp@default:default,org.eclipse.recommenders.constructors@default:default,org.eclipse.recommenders.coordinates.rcp@default:default,org.eclipse.recommenders.coordinates@default:default,org.eclipse.recommenders.injection@default:default,org.eclipse.recommenders.jayes.io@default:default,org.eclipse.recommenders.jayes@default:default,org.eclipse.recommenders.jdt@default:default,org.eclipse.recommenders.models.rcp@default:default,org.eclipse.recommenders.models@default:default,org.eclipse.recommenders.mylyn.rcp@default:default,org.eclipse.recommenders.net@default:default,org.eclipse.recommenders.news.api@default:default,org.eclipse.recommenders.news.impl@default:default,org.eclipse.recommenders.news.rcp@default:default,org.eclipse.recommenders.news@default:default,org.eclipse.recommenders.overrides.rcp@default:default,org.eclipse.recommenders.overrides@default:default,org.eclipse.recommenders.rcp@default:default,org.eclipse.recommenders.snipmatch.rcp@default:default,org.eclipse.recommenders.snipmatch@default:default,org.eclipse.recommenders.subwords.rcp@default:default,org.eclipse.recommenders.types.rcp@default:default,org.eclipse.recommenders.utils.rcp@default:default,org.eclipse.recommenders.utils@default:default,org.eclipse.search@default:default,org.eclipse.sirius.common.acceleo.aql.ide@default:default,org.eclipse.sirius.common.acceleo.aql@default:default,org.eclipse.sirius.common.acceleo.mtl.ide@default:default,org.eclipse.sirius.common.acceleo.mtl@default:default,org.eclipse.sirius.common.interpreter@default:default,org.eclipse.sirius.common.ocl@default:default,org.eclipse.sirius.common.ui.ext@default:default,org.eclipse.sirius.common.ui@default:default,org.eclipse.sirius.common.xtext@default:default,org.eclipse.sirius.common@default:default,org.eclipse.sirius.diagram.formatdata@default:default,org.eclipse.sirius.diagram.layoutdata@default:default,org.eclipse.sirius.diagram.sequence.edit@default:default,org.eclipse.sirius.diagram.sequence.ui@default:default,org.eclipse.sirius.diagram.sequence@default:default,org.eclipse.sirius.diagram.ui.ext@default:default,org.eclipse.sirius.diagram.ui@default:default,org.eclipse.sirius.diagram@default:default,org.eclipse.sirius.doc@default:default,org.eclipse.sirius.ecore.extender@default:default,org.eclipse.sirius.editor.diagram@default:default,org.eclipse.sirius.editor.properties.ext.widgets.reference@default:default,org.eclipse.sirius.editor.properties@default:default,org.eclipse.sirius.editor.sequence@default:default,org.eclipse.sirius.editor.table@default:default,org.eclipse.sirius.editor.tree@default:default,org.eclipse.sirius.editor@default:default,org.eclipse.sirius.eef.adapters@default:default,org.eclipse.sirius.ext.base@default:default,org.eclipse.sirius.ext.draw2d@default:default,org.eclipse.sirius.ext.e3.ui@default:default,org.eclipse.sirius.ext.e3@default:default,org.eclipse.sirius.ext.emf.edit@default:default,org.eclipse.sirius.ext.emf.tx@default:default,org.eclipse.sirius.ext.emf.ui@default:default,org.eclipse.sirius.ext.emf@default:default,org.eclipse.sirius.ext.gef@default:default,org.eclipse.sirius.ext.gmf.notation@default:default,org.eclipse.sirius.ext.gmf.runtime@default:default,org.eclipse.sirius.ext.jface@default:default,org.eclipse.sirius.ext.swt@default:default,org.eclipse.sirius.interpreter@default:default,org.eclipse.sirius.properties.edit@default:default,org.eclipse.sirius.properties.ext.widgets.reference.edit@default:default,org.eclipse.sirius.properties.ext.widgets.reference@default:default,org.eclipse.sirius.properties@default:default,org.eclipse.sirius.samples.family@default:default,org.eclipse.sirius.synchronizer@default:default,org.eclipse.sirius.table.ui.ext@default:default,org.eclipse.sirius.table.ui@default:default,org.eclipse.sirius.table@default:default,org.eclipse.sirius.tree.ui.ext@default:default,org.eclipse.sirius.tree.ui@default:default,org.eclipse.sirius.tree@default:default,org.eclipse.sirius.ui.ext@default:default,org.eclipse.sirius.ui.properties.ext.widgets.reference@default:default,org.eclipse.sirius.ui.properties@default:default,org.eclipse.sirius.ui@default:default,org.eclipse.sirius@default:default,org.eclipse.swt.cocoa.macosx.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.team.cvs.ssh2@default:default,org.eclipse.team.cvs.ui@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.browser@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro.quicklinks@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.monitoring@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.net@default:default,org.eclipse.ui.themes@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.uml2.codegen.ecore@default:default,org.eclipse.uml2.common.edit@default:default,org.eclipse.uml2.common@default:default,org.eclipse.uml2.types@default:default,org.eclipse.uml2.uml.edit@default:default,org.eclipse.uml2.uml.editor@default:default,org.eclipse.uml2.uml.profile.standard@default:default,org.eclipse.uml2.uml.resources@default:default,org.eclipse.uml2.uml.validation@default:default,org.eclipse.uml2.uml@default:default,org.eclipse.update.configurator@3:true,org.eclipse.upr.depl.papyrus@default:default,org.eclipse.upr.depl@default:default,org.eclipse.upr.soaml.papyrus@default:default,org.eclipse.upr.soaml@default:default,org.eclipse.upr.utp.papyrus@default:default,org.eclipse.upr.utp@default:default,org.eclipse.userstorage.ui@default:default,org.eclipse.userstorage@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.wst.common.frameworks.ui@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.wst.common.ui@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.wst.sse.ui@default:default,org.eclipse.wst.validation.ui@default:default,org.eclipse.wst.validation@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.wst.xml.ui@default:default,org.eclipse.wst.xsd.core@default:default,org.eclipse.xpand@default:default,org.eclipse.xsd@default:default,org.eclipse.xtend.core@default:default,org.eclipse.xtend.doc@default:default,org.eclipse.xtend.examples@default:default,org.eclipse.xtend.ide.common@default:default,org.eclipse.xtend.ide@default:default,org.eclipse.xtend.lib.macro@default:default,org.eclipse.xtend.lib@default:default,org.eclipse.xtend.m2e@default:default,org.eclipse.xtend.standalone@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.xtend2.lib@default:default,org.eclipse.xtend@default:default,org.eclipse.xtext.activities@default:default,org.eclipse.xtext.builder.standalone@default:default,org.eclipse.xtext.builder@default:default,org.eclipse.xtext.common.types.edit@default:default,org.eclipse.xtext.common.types.shared.jdt38@default:false,org.eclipse.xtext.common.types.shared@default:default,org.eclipse.xtext.common.types.ui@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.xtext.doc@default:default,org.eclipse.xtext.ecore@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.xtext.ide@default:default,org.eclipse.xtext.idea.generator@default:default,org.eclipse.xtext.java@default:default,org.eclipse.xtext.junit4@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.xtext.m2e@default:default,org.eclipse.xtext.purexbase.ui@default:default,org.eclipse.xtext.purexbase@default:default,org.eclipse.xtext.smap@default:default,org.eclipse.xtext.ui.codetemplates.ui@default:default,org.eclipse.xtext.ui.codetemplates@default:default,org.eclipse.xtext.ui.ecore@default:default,org.eclipse.xtext.ui.shared@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.xtext.util@default:default,org.eclipse.xtext.xbase.ide@default:default,org.eclipse.xtext.xbase.junit@default:default,org.eclipse.xtext.xbase.lib@default:default,org.eclipse.xtext.xbase.ui@default:default,org.eclipse.xtext.xbase@default:default,org.eclipse.xtext.xtext.generator@default:default,org.eclipse.xtext.xtext.ui.examples@default:default,org.eclipse.xtext.xtext.ui.graph@default:default,org.eclipse.xtext.xtext.ui@default:default,org.eclipse.xtext.xtext.wizard@default:default,org.eclipse.xtext@default:default,org.eclipse.xwt@default:default,org.gradle.toolingapi@default:default,org.h2@default:default,org.hamcrest.core@default:default,org.jsoup@default:default,org.junit@default:default,org.kohsuke.args4j@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.slf4j.impl.log4j12@default:false,org.sonatype.m2e.mavenarchiver@default:default,org.sonatype.tycho.m2e@default:default,org.tukaani.xz@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.papyrus.bundles.tests@default:default,org.eclipse.papyrus.codegen@default:default,org.eclipse.papyrus.customization.nattableconfiguration@default:default,org.eclipse.papyrus.customization.palette@default:default,org.eclipse.papyrus.customization.paletteconfiguration@default:default,org.eclipse.papyrus.def@default:default,org.eclipse.papyrus.dev.assistants.codegen@default:default,org.eclipse.papyrus.dev.java.utils@default:default,org.eclipse.papyrus.dev.project.management@default:default,org.eclipse.papyrus.dev.tests.framework.ui@default:default,org.eclipse.papyrus.dev.tests.framework@default:default,org.eclipse.papyrus.dev.types@default:default,org.eclipse.papyrus.dev.view.services.edit.request@default:default,org.eclipse.papyrus.developer.profile@default:default,org.eclipse.papyrus.developer.suite.tests@default:default,org.eclipse.papyrus.eclipse.project.editors.tests@default:default,org.eclipse.papyrus.eclipse.project.editors@default:default,org.eclipse.papyrus.editor.integration.tests@default:default,org.eclipse.papyrus.editor.perspectiveconfiguration@default:default,org.eclipse.papyrus.editor@default:default,org.eclipse.papyrus.emf.facet.aggregate.doc@default:default,org.eclipse.papyrus.emf.facet.common.core@default:default,org.eclipse.papyrus.emf.facet.common.sdk.core@default:default,org.eclipse.papyrus.emf.facet.common.ui@default:default,org.eclipse.papyrus.emf.facet.custom.core@default:default,org.eclipse.papyrus.emf.facet.custom.doc@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel.edit@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel.editor.doc@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel.editor@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel@default:default,org.eclipse.papyrus.emf.facet.custom.sdk.core@default:default,org.eclipse.papyrus.emf.facet.custom.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.custom.ui@default:default,org.eclipse.papyrus.emf.facet.doc@default:default,org.eclipse.papyrus.emf.facet.efacet.catalog@default:default,org.eclipse.papyrus.emf.facet.efacet.core@default:default,org.eclipse.papyrus.emf.facet.efacet.doc@default:default,org.eclipse.papyrus.emf.facet.efacet.edit@default:default,org.eclipse.papyrus.emf.facet.efacet.editor@default:default,org.eclipse.papyrus.emf.facet.efacet.metamodel.edit@default:default,org.eclipse.papyrus.emf.facet.efacet.metamodel@default:default,org.eclipse.papyrus.emf.facet.efacet.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.efacet.ui@default:default,org.eclipse.papyrus.emf.facet.efacet@default:default,org.eclipse.papyrus.emf.facet.query.java.core@default:default,org.eclipse.papyrus.emf.facet.query.java.metamodel@default:default,org.eclipse.papyrus.emf.facet.query.java.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.query.java@default:default,org.eclipse.papyrus.emf.facet.query.ocl.core@default:default,org.eclipse.papyrus.emf.facet.query.ocl.metamodel@default:default,org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.util.core@default:default,org.eclipse.papyrus.emf.facet.util.emf.catalog@default:default,org.eclipse.papyrus.emf.facet.util.emf.core@default:default,org.eclipse.papyrus.emf.facet.util.emf.doc@default:default,org.eclipse.papyrus.emf.facet.util.emf.ui@default:default,org.eclipse.papyrus.emf.facet.util.jface.ui@default:default,org.eclipse.papyrus.emf.facet.util.pde.core@default:default,org.eclipse.papyrus.emf.facet.util.swt@default:default,org.eclipse.papyrus.emf.facet.util.ui@default:default,org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore@default:default,org.eclipse.papyrus.emf.facet.widgets.celleditors@default:default,org.eclipse.papyrus.emf.facet.widgets@default:default,org.eclipse.papyrus.extensionpoints.editors@default:default,org.eclipse.papyrus.gmf.editpartview@default:default,org.eclipse.papyrus.gmf.editpoliciesstates@default:default,org.eclipse.papyrus.gmf.figureview@default:default,org.eclipse.papyrus.gmfgenextension@default:default,org.eclipse.papyrus.infra.constraints.edit@default:default,org.eclipse.papyrus.infra.constraints.editor@default:default,org.eclipse.papyrus.infra.constraints.ui@default:default,org.eclipse.papyrus.infra.constraints@default:default,org.eclipse.papyrus.infra.core.architecture.edit@default:default,org.eclipse.papyrus.infra.architecture.representation.edit@default:default,org.eclipse.papyrus.infra.architecture.representation@default:default,org.eclipse.papyrus.infra.architecture@default:default,org.eclipse.papyrus.infra.core.architecture@default:default,org.eclipse.papyrus.infra.core.clipboard.tests@default:default,org.eclipse.papyrus.infra.core.log@default:default,org.eclipse.papyrus.infra.core.pluginexplorer@default:default,org.eclipse.papyrus.infra.core.sasheditor.di.tests@default:default,org.eclipse.papyrus.infra.core.sasheditor.di@default:default,org.eclipse.papyrus.infra.core.sasheditor.tests@default:default,org.eclipse.papyrus.infra.core.sasheditor@default:default,org.eclipse.papyrus.infra.core.sashwindows.di@default:default,org.eclipse.papyrus.infra.core.suite.tests@default:default,org.eclipse.papyrus.infra.core.tests@default:default,org.eclipse.papyrus.infra.core@default:default,org.eclipse.papyrus.infra.discovery.ui.menu@default:default,org.eclipse.papyrus.infra.discovery.ui@default:default,org.eclipse.papyrus.infra.discovery@default:default,org.eclipse.papyrus.infra.editor.welcome.internationalization@default:default,org.eclipse.papyrus.infra.editor.welcome.nattable@default:default,org.eclipse.papyrus.infra.editor.welcome.tests@default:default,org.eclipse.papyrus.infra.editor.welcome@default:default,org.eclipse.papyrus.infra.emf.appearance@default:default,org.eclipse.papyrus.infra.emf.commandstack@default:default,org.eclipse.papyrus.infra.emf.diagram.common@default:default,org.eclipse.papyrus.infra.emf.gmf.tests@default:default,org.eclipse.papyrus.infra.emf.gmf@default:default,org.eclipse.papyrus.infra.emf.nattable@default:default,org.eclipse.papyrus.infra.emf.readonly.tests@default:default,org.eclipse.papyrus.infra.emf.readonly@default:default,org.eclipse.papyrus.infra.emf.tests@default:default,org.eclipse.papyrus.infra.emf.types.ui.properties@default:default,org.eclipse.papyrus.infra.emf.types.ui@default:default,org.eclipse.papyrus.infra.emf.types@default:default,org.eclipse.papyrus.infra.emf@default:default,org.eclipse.papyrus.infra.filters.edit@default:default,org.eclipse.papyrus.infra.filters.tests@default:default,org.eclipse.papyrus.infra.filters@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant.edit@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant.editor@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant.ui@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant@default:default,org.eclipse.papyrus.infra.gmfdiag.canonical.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.canonical@default:default,org.eclipse.papyrus.infra.gmfdiag.commands.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.commands@default:default,org.eclipse.papyrus.infra.gmfdiag.common.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.common@default:default,org.eclipse.papyrus.infra.gmfdiag.controlmode@default:default,org.eclipse.papyrus.infra.gmfdiag.css.configuration@default:default,org.eclipse.papyrus.infra.gmfdiag.css.debug@default:default,org.eclipse.papyrus.infra.gmfdiag.css.model@default:default,org.eclipse.papyrus.infra.gmfdiag.css.properties@default:default,org.eclipse.papyrus.infra.gmfdiag.css.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.css.theme@default:default,org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui@default:default,org.eclipse.papyrus.infra.gmfdiag.css3.xtext@default:default,org.eclipse.papyrus.infra.gmfdiag.css@default:default,org.eclipse.papyrus.infra.gmfdiag.dnd@default:default,org.eclipse.papyrus.infra.gmfdiag.expansion.edit@default:default,org.eclipse.papyrus.infra.gmfdiag.expansion.editor@default:default,org.eclipse.papyrus.infra.gmfdiag.expansion@default:default,org.eclipse.papyrus.infra.gmfdiag.export@default:default,org.eclipse.papyrus.infra.gmfdiag.gef@default:default,org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter@default:default,org.eclipse.papyrus.infra.gmfdiag.hyperlink@default:default,org.eclipse.papyrus.infra.gmfdiag.menu.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.menu@default:default,org.eclipse.papyrus.infra.gmfdiag.modelexplorer@default:default,org.eclipse.papyrus.infra.gmfdiag.navigation@default:default,org.eclipse.papyrus.infra.gmfdiag.outline@default:default,org.eclipse.papyrus.infra.gmfdiag.preferences@default:default,org.eclipse.papyrus.infra.gmfdiag.properties@default:default,org.eclipse.papyrus.infra.gmfdiag.tooling.runtime@default:default,org.eclipse.papyrus.infra.gmfdiag.viewersearcher@default:default,org.eclipse.papyrus.infra.gmfdiag.welcome.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.welcome@default:default,org.eclipse.papyrus.infra.gmfdiag.widgets@default:default,org.eclipse.papyrus.infra.hyperlink@default:default,org.eclipse.papyrus.infra.internationalization.common@default:default,org.eclipse.papyrus.infra.internationalization.controlmode@default:default,org.eclipse.papyrus.infra.internationalization.edit@default:default,org.eclipse.papyrus.infra.internationalization.readonly@default:default,org.eclipse.papyrus.infra.internationalization.tests@default:default,org.eclipse.papyrus.infra.internationalization.ui@default:default,org.eclipse.papyrus.infra.internationalization.utils@default:default,org.eclipse.papyrus.infra.internationalization@default:default,org.eclipse.papyrus.infra.nattable.common.tests@default:default,org.eclipse.papyrus.infra.nattable.common@default:default,org.eclipse.papyrus.infra.nattable.controlmode@default:default,org.eclipse.papyrus.infra.nattable.gmfdiag@default:default,org.eclipse.papyrus.infra.nattable.model.edit@default:default,org.eclipse.papyrus.infra.nattable.model.editor.tests@default:default,org.eclipse.papyrus.infra.nattable.model.editor@default:default,org.eclipse.papyrus.infra.nattable.model.tests@default:default,org.eclipse.papyrus.infra.nattable.model@default:default,org.eclipse.papyrus.infra.nattable.modelexplorer@default:default,org.eclipse.papyrus.infra.nattable.properties@default:default,org.eclipse.papyrus.infra.nattable.suite.tests@default:default,org.eclipse.papyrus.infra.nattable.tests@default:default,org.eclipse.papyrus.infra.nattable.views.config@default:default,org.eclipse.papyrus.infra.nattable.views.editor@default:default,org.eclipse.papyrus.infra.nattable.views.tests@default:default,org.eclipse.papyrus.infra.nattable@default:default,org.eclipse.papyrus.infra.newchild.edit@default:default,org.eclipse.papyrus.infra.newchild.editor@default:default,org.eclipse.papyrus.infra.newchild.tests@default:default,org.eclipse.papyrus.infra.newchild.ui@default:default,org.eclipse.papyrus.infra.newchild@default:default,org.eclipse.papyrus.infra.onefile.ui@default:default,org.eclipse.papyrus.infra.onefile@default:default,org.eclipse.papyrus.infra.properties.edit@default:default,org.eclipse.papyrus.infra.properties.editor@default:default,org.eclipse.papyrus.infra.properties.ui.tests@default:default,org.eclipse.papyrus.infra.properties.ui@default:default,org.eclipse.papyrus.infra.properties@default:default,org.eclipse.papyrus.infra.psf@default:default,org.eclipse.papyrus.infra.services.controlmode.history@default:default,org.eclipse.papyrus.infra.services.controlmode.tests@default:default,org.eclipse.papyrus.infra.services.controlmode@default:default,org.eclipse.papyrus.infra.services.decoration@default:default,org.eclipse.papyrus.infra.services.edit.tests@default:default,org.eclipse.papyrus.infra.services.edit.ui.tests@default:default,org.eclipse.papyrus.infra.services.edit.ui@default:default,org.eclipse.papyrus.infra.services.edit@default:default,org.eclipse.papyrus.infra.services.labelprovider.tests@default:default,org.eclipse.papyrus.infra.services.labelprovider@default:default,org.eclipse.papyrus.infra.services.localizer@default:default,org.eclipse.papyrus.infra.services.markerlistener@default:default,org.eclipse.papyrus.infra.services.navigation@default:default,org.eclipse.papyrus.infra.services.openelement@default:default,org.eclipse.papyrus.infra.services.resourceloading.tests@default:default,org.eclipse.papyrus.infra.services.resourceloading.ui@default:default,org.eclipse.papyrus.infra.services.resourceloading@default:default,org.eclipse.papyrus.infra.services.semantic.tests@default:default,org.eclipse.papyrus.infra.services.semantic@default:default,org.eclipse.papyrus.infra.services.validation@default:default,org.eclipse.papyrus.infra.services.viewersearch@default:default,org.eclipse.papyrus.infra.services.viewlabelprovider@default:default,org.eclipse.papyrus.infra.suite.tests@default:default,org.eclipse.papyrus.infra.sync@default:default,org.eclipse.papyrus.infra.tools.tests@default:default,org.eclipse.papyrus.infra.tools@default:default,org.eclipse.papyrus.infra.types.core@default:default,org.eclipse.papyrus.infra.types.edit@default:default,org.eclipse.papyrus.infra.types.editor@default:default,org.eclipse.papyrus.infra.types.rulebased@default:default,org.eclipse.papyrus.infra.types.tests@default:default,org.eclipse.papyrus.infra.types.ui.tests@default:default,org.eclipse.papyrus.infra.types.ui@default:default,org.eclipse.papyrus.infra.types@default:default,org.eclipse.papyrus.infra.ui.architecture@default:default,org.eclipse.papyrus.infra.ui.emf.tests@default:default,org.eclipse.papyrus.infra.ui.emf@default:default,org.eclipse.papyrus.infra.ui.resources@default:default,org.eclipse.papyrus.infra.ui.tests@default:default,org.eclipse.papyrus.infra.ui@default:default,org.eclipse.papyrus.infra.viewpoints.policy.edit@default:default,org.eclipse.papyrus.infra.viewpoints.policy.tests@default:default,org.eclipse.papyrus.infra.viewpoints.policy@default:default,org.eclipse.papyrus.infra.widgets.toolbox@default:default,org.eclipse.papyrus.infra.widgets@default:default,org.eclipse.papyrus.junit.framework@default:default,org.eclipse.papyrus.junit.utils@default:default,org.eclipse.papyrus.mwe2.utils@default:default,org.eclipse.papyrus.releng.dev.release@default:default,org.eclipse.papyrus.releng.main.release@default:default,org.eclipse.papyrus.sdk@default:default,org.eclipse.papyrus.sysml.architecture@default:default,org.eclipse.papyrus.sysml.diagram.blockdefinition.tests@default:default,org.eclipse.papyrus.sysml.diagram.blockdefinition@default:default,org.eclipse.papyrus.sysml.diagram.common@default:default,org.eclipse.papyrus.sysml.diagram.css@default:default,org.eclipse.papyrus.sysml.diagram.internalblock.tests@default:default,org.eclipse.papyrus.sysml.diagram.internalblock@default:default,org.eclipse.papyrus.sysml.diagram.parametric.tests@default:default,org.eclipse.papyrus.sysml.diagram.parametric@default:default,org.eclipse.papyrus.sysml.diagram.requirement.tests@default:default,org.eclipse.papyrus.sysml.diagram.requirement@default:default,org.eclipse.papyrus.sysml.diagram.ui@default:default,org.eclipse.papyrus.sysml.edit@default:default,org.eclipse.papyrus.sysml.modelexplorer.tests@default:default,org.eclipse.papyrus.sysml.modelexplorer@default:default,org.eclipse.papyrus.sysml.nattable.allocation.config@default:default,org.eclipse.papyrus.sysml.nattable.allocation.tests@default:default,org.eclipse.papyrus.sysml.nattable.allocation@default:default,org.eclipse.papyrus.sysml.nattable.menu@default:default,org.eclipse.papyrus.sysml.nattable.requirement.config@default:default,org.eclipse.papyrus.sysml.nattable.requirement.tests@default:default,org.eclipse.papyrus.sysml.nattable.requirement@default:default,org.eclipse.papyrus.sysml.nattable@default:default,org.eclipse.papyrus.sysml.properties@default:default,org.eclipse.papyrus.sysml.service.types.tests@default:default,org.eclipse.papyrus.sysml.service.types@default:default,org.eclipse.papyrus.sysml.tests@default:default,org.eclipse.papyrus.sysml@default:default,org.eclipse.papyrus.tests.framework.annotations@default:default,org.eclipse.papyrus.tests.framework.edit@default:default,org.eclipse.papyrus.tests.framework.editor@default:default,org.eclipse.papyrus.tests.framework@default:default,org.eclipse.papyrus.tests@default:default,org.eclipse.papyrus.toolsmiths@default:default,org.eclipse.papyrus.uml.alf.backend.tests@default:default,org.eclipse.papyrus.uml.alf.common.ui@default:default,org.eclipse.papyrus.uml.alf.common@default:default,org.eclipse.papyrus.uml.alf.libraries@default:default,org.eclipse.papyrus.uml.alf.tests@default:default,org.eclipse.papyrus.uml.alf.to.fuml@default:default,org.eclipse.papyrus.uml.alf.ui@default:default,org.eclipse.papyrus.uml.alf@default:default,org.eclipse.papyrus.uml.appearance@default:default,org.eclipse.papyrus.uml.architecture@default:default,org.eclipse.papyrus.uml.commands@default:default,org.eclipse.papyrus.uml.controlmode.profile@default:default,org.eclipse.papyrus.uml.decoratormodel.controlmode.tests@default:default,org.eclipse.papyrus.uml.decoratormodel.controlmode@default:default,org.eclipse.papyrus.uml.decoratormodel.properties@default:default,org.eclipse.papyrus.uml.decoratormodel.tests@default:default,org.eclipse.papyrus.uml.decoratormodel.ui@default:default,org.eclipse.papyrus.uml.decoratormodel@default:default,org.eclipse.papyrus.uml.developer.mde@default:default,org.eclipse.papyrus.uml.diagram.activity.tests@default:default,org.eclipse.papyrus.uml.diagram.activity@default:default,org.eclipse.papyrus.uml.diagram.clazz.tests@default:default,org.eclipse.papyrus.uml.diagram.clazz@default:default,org.eclipse.papyrus.uml.diagram.common.groups@default:default,org.eclipse.papyrus.uml.diagram.common.palette.customaction@default:default,org.eclipse.papyrus.uml.diagram.common.tests@default:default,org.eclipse.papyrus.uml.diagram.common@default:default,org.eclipse.papyrus.uml.diagram.communication.tests@default:default,org.eclipse.papyrus.uml.diagram.communication@default:default,org.eclipse.papyrus.uml.diagram.component.tests@default:default,org.eclipse.papyrus.uml.diagram.component@default:default,org.eclipse.papyrus.uml.diagram.composite.tests@default:default,org.eclipse.papyrus.uml.diagram.composite@default:default,org.eclipse.papyrus.uml.diagram.css.palette@default:default,org.eclipse.papyrus.uml.diagram.css@default:default,org.eclipse.papyrus.uml.diagram.deployment.tests@default:default,org.eclipse.papyrus.uml.diagram.deployment@default:default,org.eclipse.papyrus.uml.diagram.dnd.tests@default:default,org.eclipse.papyrus.uml.diagram.dnd@default:default,org.eclipse.papyrus.uml.diagram.icons@default:default,org.eclipse.papyrus.uml.diagram.interactionoverview.tests@default:default,org.eclipse.papyrus.uml.diagram.interactionoverview@default:default,org.eclipse.papyrus.uml.diagram.linklf@default:default,org.eclipse.papyrus.uml.diagram.menu@default:default,org.eclipse.papyrus.uml.diagram.modelexplorer@default:default,org.eclipse.papyrus.uml.diagram.navigation@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration.editor@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration@default:default,org.eclipse.papyrus.uml.diagram.profile.tests@default:default,org.eclipse.papyrus.uml.diagram.profile@default:default,org.eclipse.papyrus.uml.diagram.sequence.tests@default:default,org.eclipse.papyrus.uml.diagram.sequence@default:default,org.eclipse.papyrus.uml.diagram.statemachine.tests@default:default,org.eclipse.papyrus.uml.diagram.statemachine@default:default,org.eclipse.papyrus.uml.diagram.stereotype.edition@default:default,org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests@default:default,org.eclipse.papyrus.uml.diagram.suite.tests@default:default,org.eclipse.papyrus.uml.diagram.symbols.properties@default:default,org.eclipse.papyrus.uml.diagram.symbols@default:default,org.eclipse.papyrus.uml.diagram.tests@default:default,org.eclipse.papyrus.uml.diagram.timing.tests@default:default,org.eclipse.papyrus.uml.diagram.timing@default:default,org.eclipse.papyrus.uml.diagram.usecase.tests@default:default,org.eclipse.papyrus.uml.diagram.usecase@default:default,org.eclipse.papyrus.uml.diagram.wizards.tests@default:default,org.eclipse.papyrus.uml.diagram.wizards@default:default,org.eclipse.papyrus.uml.documentation.profile@default:default,org.eclipse.papyrus.uml.dynamic.profile.tests@default:default,org.eclipse.papyrus.uml.extensionpoints@default:default,org.eclipse.papyrus.uml.filters.edit@default:default,org.eclipse.papyrus.uml.filters.tests@default:default,org.eclipse.papyrus.uml.filters@default:default,org.eclipse.papyrus.uml.icons@default:default,org.eclipse.papyrus.uml.import@default:default,org.eclipse.papyrus.uml.internationalization.controlmode.tests@default:default,org.eclipse.papyrus.uml.internationalization.edit@default:default,org.eclipse.papyrus.uml.internationalization.tests@default:default,org.eclipse.papyrus.uml.internationalization.utils@default:default,org.eclipse.papyrus.uml.internationalization@default:default,org.eclipse.papyrus.uml.modelexplorer.tests@default:default,org.eclipse.papyrus.uml.modelexplorer.widgets@default:default,org.eclipse.papyrus.uml.modelexplorer@default:default,org.eclipse.papyrus.uml.modelrepair.tests@default:default,org.eclipse.papyrus.uml.modelrepair@default:default,org.eclipse.papyrus.uml.nattable.clazz.config.tests@default:default,org.eclipse.papyrus.uml.nattable.clazz.config@default:default,org.eclipse.papyrus.uml.nattable.generic.config@default:default,org.eclipse.papyrus.uml.nattable.generic.tests@default:default,org.eclipse.papyrus.uml.nattable.generic@default:default,org.eclipse.papyrus.uml.nattable.menu@default:default,org.eclipse.papyrus.uml.nattable.richtext@default:default,org.eclipse.papyrus.uml.nattable.stereotype.display.tests@default:default,org.eclipse.papyrus.uml.nattable.stereotype.display@default:default,org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests@default:default,org.eclipse.papyrus.uml.nattable.suite.tests@default:default,org.eclipse.papyrus.uml.nattable.tests@default:default,org.eclipse.papyrus.uml.nattable.xtext.integration@default:default,org.eclipse.papyrus.uml.nattable.xtext.valuespecification@default:default,org.eclipse.papyrus.uml.nattable@default:default,org.eclipse.papyrus.uml.navigation@default:default,org.eclipse.papyrus.uml.perspective@default:default,org.eclipse.papyrus.uml.profile.assistants.generator.tests@default:default,org.eclipse.papyrus.uml.profile.assistants.generator.ui@default:default,org.eclipse.papyrus.uml.profile.assistants.generator@default:default,org.eclipse.papyrus.uml.profile.drafter.documentation@default:default,org.eclipse.papyrus.uml.profile.drafter.tests@default:default,org.eclipse.papyrus.uml.profile.drafter@default:default,org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui@default:default,org.eclipse.papyrus.uml.profile.newchildmenu.generator@default:default,org.eclipse.papyrus.uml.profile.tests@default:default,org.eclipse.papyrus.uml.profile.types.generator.tests@default:default,org.eclipse.papyrus.uml.profile.types.generator.ui@default:default,org.eclipse.papyrus.uml.profile.types.generator@default:default,org.eclipse.papyrus.uml.profile@default:default,org.eclipse.papyrus.uml.properties.generation@default:default,org.eclipse.papyrus.uml.properties.xtext@default:default,org.eclipse.papyrus.uml.properties@default:default,org.eclipse.papyrus.uml.resourceloading.profile@default:default,org.eclipse.papyrus.uml.search.ui@default:default,org.eclipse.papyrus.uml.service.types.tests@default:default,org.eclipse.papyrus.uml.service.types.ui.tests@default:default,org.eclipse.papyrus.uml.service.types.ui@default:default,org.eclipse.papyrus.uml.service.types@default:default,org.eclipse.papyrus.uml.service.validation@default:default,org.eclipse.papyrus.uml.services.decoration@default:default,org.eclipse.papyrus.uml.suite.tests@default:default,org.eclipse.papyrus.uml.templaterepository@default:default,org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.collaborationuse.xtext@default:default,org.eclipse.papyrus.uml.textedit.common.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.common.xtext@default:default,org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext@default:default,org.eclipse.papyrus.uml.textedit.javaconstraint@default:default,org.eclipse.papyrus.uml.textedit.message.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.message.xtext@default:default,org.eclipse.papyrus.uml.textedit.parameter.tests@default:default,org.eclipse.papyrus.uml.textedit.parameter.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.parameter.xtext@default:default,org.eclipse.papyrus.uml.textedit.port.tests@default:default,org.eclipse.papyrus.uml.textedit.port.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.port.xtext@default:default,org.eclipse.papyrus.uml.textedit.property.tests@default:default,org.eclipse.papyrus.uml.textedit.property.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.property.xtext@default:default,org.eclipse.papyrus.uml.textedit.state.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.state.xtext@default:default,org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext@default:default,org.eclipse.papyrus.uml.textedit.suite.tests@default:default,org.eclipse.papyrus.uml.textedit.tests@default:default,org.eclipse.papyrus.uml.textedit.transition.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.transition.xtext@default:default,org.eclipse.papyrus.uml.textedit.valuespecification.tests@default:default,org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils@default:default,org.eclipse.papyrus.uml.textedit.valuespecification.xtext@default:default,org.eclipse.papyrus.uml.tools.tests@default:default,org.eclipse.papyrus.uml.tools.utils.tests@default:default,org.eclipse.papyrus.uml.tools.utils@default:default,org.eclipse.papyrus.uml.tools@default:default,org.eclipse.papyrus.uml.types.core@default:default,org.eclipse.papyrus.uml.types.ui.properties@default:default,org.eclipse.papyrus.uml.ui@default:default,org.eclipse.papyrus.uml.validation.tests.genvalidation@default:default,org.eclipse.papyrus.uml.validation.tests.staticprofile@default:default,org.eclipse.papyrus.uml.validation.tests@default:default,org.eclipse.papyrus.uml.xtext.integration.core@default:default,org.eclipse.papyrus.uml.xtext.integration.ui@default:default,org.eclipse.papyrus.uml.xtext.integration.validation@default:default,org.eclipse.papyrus.views.documentation@default:default,org.eclipse.papyrus.views.modelexplorer.newchild@default:default,org.eclipse.papyrus.views.modelexplorer.resourceloading@default:default,org.eclipse.papyrus.views.modelexplorer.tests@default:default,org.eclipse.papyrus.views.modelexplorer.widgets@default:default,org.eclipse.papyrus.views.modelexplorer@default:default,org.eclipse.papyrus.views.properties.model.xwt@default:default,org.eclipse.papyrus.views.properties.toolsmiths@default:default,org.eclipse.papyrus.views.properties@default:default,org.eclipse.papyrus.views.references@default:default,org.eclipse.papyrus.views.search@default:default,org.eclipse.papyrus.views.suite.tests@default:default,org.eclipse.papyrus.views.validation@default:default"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <booleanAttribute key="tracing" value="false"/>
 <booleanAttribute key="useCustomFeatures" value="false"/>
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/META-INF/MANIFEST.MF
index d2582f1ac69..8e70b1843c9 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.uml.diagram.tests;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.sequence;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.sequence;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/META-INF/MANIFEST.MF
index 24db229d443..e643ce2ad0f 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/META-INF/MANIFEST.MF
@@ -36,7 +36,9 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.service.types.ui;bundle-version="1.2.0"
+ org.eclipse.papyrus.uml.service.types.ui;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.architecture;bundle-version="1.0.0",
+ org.eclipse.papyrus.uml.diagram.wizards;bundle-version="3.0.0"
 Export-Package: org.eclipse.papyrus.uml.diagram.tests.appearance,
  org.eclipse.papyrus.uml.diagram.tests.canonical,
  org.eclipse.papyrus.uml.diagram.tests.createFromPalette,
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/SharedTestSuiteState.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/SharedTestSuiteState.java
index 646bcdc2753..12950111166 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/SharedTestSuiteState.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.tests/src/org/eclipse/papyrus/uml/diagram/tests/canonical/SharedTestSuiteState.java
@@ -31,6 +31,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
 import org.eclipse.gmf.runtime.notation.StringValueStyle;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.commands.ICreationCommand;
+import org.eclipse.papyrus.infra.architecture.ArchitectureDomainManager;
+import org.eclipse.papyrus.infra.architecture.commands.IModelCreationCommand;
 import org.eclipse.papyrus.infra.core.resource.ModelSet;
 import org.eclipse.papyrus.infra.core.services.ExtensionServicesRegistry;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
@@ -39,8 +41,10 @@ import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramVersioningUtil
 import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
 import org.eclipse.papyrus.junit.utils.JUnitUtils;
 import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
+import org.eclipse.papyrus.uml.architecture.UMLArchitectureContextIds;
 import org.eclipse.papyrus.uml.diagram.common.commands.CreateUMLModelCommand;
 import org.eclipse.papyrus.uml.diagram.profile.CreateProfileModelCommand;
+import org.eclipse.papyrus.uml.diagram.wizards.command.NewPapyrusModelCommand;
 import org.eclipse.papyrus.uml.tools.model.UmlModel;
 import org.eclipse.papyrus.uml.tools.utils.CustomUMLUtil;
 import org.eclipse.swt.widgets.Display;
@@ -187,13 +191,27 @@ public class SharedTestSuiteState implements TestRule {
 		}
 		if (!file.exists()) {
 			URI fileURI = URI.createPlatformResourceURI(file.getFullPath().toString(), true);
-			modelSet.createModels(fileURI);
-
-			if (fileURI.lastSegment().matches(".*\\.profile\\.(di|uml)")) {
-				new CreateProfileModelCommand().createModel(modelSet);
-			} else {
-				new CreateUMLModelCommand().createModel(modelSet);
-			}
+			
+			final String contextId;
+			if (fileURI.lastSegment().matches(".*\\.profile\\.(di|uml)"))
+				contextId = UMLArchitectureContextIds.Profile;
+			else
+				contextId = UMLArchitectureContextIds.UML;
+
+			RecordingCommand command = new NewPapyrusModelCommand(modelSet, fileURI);
+			modelSet.getTransactionalEditingDomain().getCommandStack().execute(command);
+			
+			TransactionalEditingDomain ted = modelSet.getTransactionalEditingDomain();
+			ted.getCommandStack().execute(new RecordingCommand(ted) {
+				@Override
+				protected void doExecute() {
+					if (contextId == UMLArchitectureContextIds.Profile) {
+						new CreateProfileModelCommand().createModel(modelSet);
+					} else {
+						new CreateUMLModelCommand().createModel(modelSet);
+					}
+				}
+			});
 
 			ServicesRegistry registry = new ExtensionServicesRegistry(org.eclipse.papyrus.infra.core.Activator.PLUGIN_ID);
 			try {
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/META-INF/MANIFEST.MF
index b6929830b94..f7ee9e2a980 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/META-INF/MANIFEST.MF
@@ -9,11 +9,11 @@ Require-Bundle: org.eclipse.uml2.uml;bundle-version="3.1.0",
  com.google.guava;bundle-version="11.0.0",
  org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
  org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.2.0",
  org.eclipse.core.resources,
  org.eclipse.core.runtime;bundle-version="3.10.0",
  org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.junit;bundle-version="4.11.0"
+ org.junit;bundle-version="4.11.0",
+ org.eclipse.papyrus.uml.architecture;bundle-version="1.0.0"
 Export-Package: org.eclipse.papyrus.uml.diagram.wizards
 Bundle-Vendor: %providerName
 Bundle-Version: 1.2.0.qualifier
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestCreateModelFromExistingModelWizard.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestCreateModelFromExistingModelWizard.java
index 7ad0d8d0007..039f893b2b7 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestCreateModelFromExistingModelWizard.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestCreateModelFromExistingModelWizard.java
@@ -1,179 +1,179 @@
-/*****************************************************************************

- * Copyright (c) 2014 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:

- * Thibault Le Ouay (Sherpa Engineering) t.leouay@sherpa-eng.com  - Initial API and implementation

- *****************************************************************************/

-package org.eclipse.papyrus.uml.diagram.wizards;

-

-import static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertNotSame;

-

-import java.io.IOException;

-

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.core.runtime.Platform;

-import org.eclipse.emf.common.util.URI;

-import org.eclipse.jface.viewers.IStructuredSelection;

-import org.eclipse.papyrus.junit.utils.PapyrusProjectUtils;

-import org.eclipse.papyrus.junit.utils.ProjectUtils;

-import org.eclipse.papyrus.uml.diagram.wizards.pages.NewModelFilePage;

-import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramCategoryPage;

-import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramKindPage;

-import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectRootElementPage;

-import org.eclipse.papyrus.uml.diagram.wizards.wizards.InitModelWizard;

-import org.eclipse.papyrus.uml.diagram.wizards.messages.Messages;

-import org.eclipse.ui.IWorkbench;

-import org.eclipse.ui.IWorkbenchWizard;

-import org.junit.Assert;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-

-

-public class TestCreateModelFromExistingModelWizard extends TestNewModelWizardBase {

-

-	// This test only covers the creation of the wizard and check if the first page contain the expected file name

-	private static IProject createProject;

-

-	private static IFile file, fileWithDot;

-

-	/**

-	 * @see org.eclipse.papyrus.uml.diagram.wizards.TestNewModelWizardBase#createWizard()

-	 *

-	 * @return

-	 */

-

-	@BeforeClass

-	public static void init() {

-		try {

-			createProject = ProjectUtils.createProject("UMLOnlyTest");

-		} catch (CoreException e) {

-			Assert.fail(e.getMessage());

-		}

-

-		try {

-			file = PapyrusProjectUtils.copyIFile("/resources/model.uml", Platform.getBundle("org.eclipse.papyrus.uml.diagram.wizards.tests"), createProject, "model.uml");

-			fileWithDot = PapyrusProjectUtils.copyIFile("/resources/model.model.uml", Platform.getBundle("org.eclipse.papyrus.uml.diagram.wizards.tests"), createProject, "model.model.uml");

-

-		} catch (CoreException e) {

-			Assert.fail(e.getMessage());

-		} catch (IOException e) {

-			Assert.fail(e.getMessage());

-		}

-	}

-

-	@Override

-	protected IWorkbenchWizard createWizard() {

-		return new InitModelWizard() {

-

-			private boolean isInitFromExistingDomainModel;

-

-			private SelectRootElementPage selectRootElementPage;

-

-			@Override

-			public void init(IWorkbench workbench, IStructuredSelection selection) {

-				URI uri = URI.createPlatformResourceURI(file.getFullPath().toString(), true);

-				isInitFromExistingDomainModel = isSupportedDomainModelResource(uri);

-				super.init(workbench, selection);

-				selectRootElementPage = createSelectRootElementPage(selection);

-				if (isCreateFromExistingDomainModel()) {

-					// Init Model not Create a new one

-					setWindowTitle(Messages.InitModelWizard_init_papyrus_diagram);

-				}

-			}

-

-			@Override

-			public boolean isCreateFromExistingDomainModel() {

-				return true;

-			}

-

-		};

-

-	}

-

-

-	@Test

-	public void testOrderOfPages() {

-		// actual pages: [SelectDiagramCategory -> SelectDiagramCategoryPage, SelectStorageProvider -> SelectStorageProviderPage,

-		// NewPapyrusModel -> NewModelFilePage, NewCDOModel -> NewModelPage, SelectDiagramKind -> SelectDiagramKindPage, SelectRootPage -> SelectRootElementPage]

-		Class<?>[] expectedPages = new Class[] { SelectDiagramCategoryPage.class, NewModelFilePage.class, SelectDiagramKindPage.class, /* SelectRootElementPage.class, */ };

-

-		IWorkbenchWizard wizard = initWizardDialog();

-		testOrderOfPages(wizard, expectedPages);

-	}

-

-	@Test

-	public void testForSimpleModel() {

-		InitModelWizard wizard = new InitModelWizard() {

-

-			private boolean isInitFromExistingDomainModel;

-

-			// private SelectRootElementPage selectRootElementPage;

-

-			@Override

-			public void init(IWorkbench workbench, IStructuredSelection selection) {

-				URI uri = URI.createPlatformResourceURI(file.getFullPath().toString(), true);

-				isInitFromExistingDomainModel = isSupportedDomainModelResource(uri);

-				super.init(workbench, selection);

-				// selectRootElementPage = createSelectRootElementPage(selection);

-				if (isCreateFromExistingDomainModel()) {

-					// Init Model not Create a new one

-					setWindowTitle(Messages.InitModelWizard_init_papyrus_diagram);

-				}

-			}

-

-			@Override

-			public boolean isCreateFromExistingDomainModel() {

-				return true;

-			}

-

-		};

-		initWizardDialog(wizard);

-		NewModelFilePage page = getPage(wizard, NewModelFilePage.class);

-		assertEquals("model.di", page.getFileName());

-

-	}

-

-	@Test

-	public void testForModelWithDot() {

-		InitModelWizard wizard = new InitModelWizard() {

-

-			private boolean isInitFromExistingDomainModel;

-

-			private SelectRootElementPage selectRootElementPage;

-

-			@Override

-			public void init(IWorkbench workbench, IStructuredSelection selection) {

-				URI uri = URI.createPlatformResourceURI(fileWithDot.getFullPath().toString(), true);

-				isInitFromExistingDomainModel = isSupportedDomainModelResource(uri);

-				super.init(workbench, selection);

-				selectRootElementPage = createSelectRootElementPage(selection);

-				if (isCreateFromExistingDomainModel()) {

-					// Init Model not Create a new one

-					setWindowTitle(Messages.InitModelWizard_init_papyrus_diagram);

-				}

-			}

-

-			@Override

-			public boolean isCreateFromExistingDomainModel() {

-				return true;

-			}

-		};

-		initWizardDialog(wizard);

-		NewModelFilePage page = getPage(wizard, NewModelFilePage.class);

-		assertNotSame("model.model.di", page.getFileName());

-		// this should be fixed in the wizard to have the right name from the begining if the name contain a dot

-

-

-	}

-

-

-}

+/*****************************************************************************
+ * Copyright (c) 2014 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:
+ * Thibault Le Ouay (Sherpa Engineering) t.leouay@sherpa-eng.com  - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.wizards;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
+
+import java.io.IOException;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.junit.utils.PapyrusProjectUtils;
+import org.eclipse.papyrus.junit.utils.ProjectUtils;
+import org.eclipse.papyrus.uml.diagram.wizards.pages.NewModelFilePage;
+import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectArchitectureContextPage;
+import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectRepresentationKindPage;
+import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectRootElementPage;
+import org.eclipse.papyrus.uml.diagram.wizards.wizards.InitModelWizard;
+import org.eclipse.papyrus.uml.diagram.wizards.messages.Messages;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchWizard;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+
+
+public class TestCreateModelFromExistingModelWizard extends TestNewModelWizardBase {
+
+	// This test only covers the creation of the wizard and check if the first page contain the expected file name
+	private static IProject createProject;
+
+	private static IFile file, fileWithDot;
+
+	/**
+	 * @see org.eclipse.papyrus.uml.diagram.wizards.TestNewModelWizardBase#createWizard()
+	 *
+	 * @return
+	 */
+
+	@BeforeClass
+	public static void init() {
+		try {
+			createProject = ProjectUtils.createProject("UMLOnlyTest");
+		} catch (CoreException e) {
+			Assert.fail(e.getMessage());
+		}
+
+		try {
+			file = PapyrusProjectUtils.copyIFile("/resources/model.uml", Platform.getBundle("org.eclipse.papyrus.uml.diagram.wizards.tests"), createProject, "model.uml");
+			fileWithDot = PapyrusProjectUtils.copyIFile("/resources/model.model.uml", Platform.getBundle("org.eclipse.papyrus.uml.diagram.wizards.tests"), createProject, "model.model.uml");
+
+		} catch (CoreException e) {
+			Assert.fail(e.getMessage());
+		} catch (IOException e) {
+			Assert.fail(e.getMessage());
+		}
+	}
+
+	@Override
+	protected IWorkbenchWizard createWizard() {
+		return new InitModelWizard() {
+
+			private boolean isInitFromExistingDomainModel;
+
+			private SelectRootElementPage selectRootElementPage;
+
+			@Override
+			public void init(IWorkbench workbench, IStructuredSelection selection) {
+				URI uri = URI.createPlatformResourceURI(file.getFullPath().toString(), true);
+				isInitFromExistingDomainModel = isSupportedDomainModelResource(uri);
+				super.init(workbench, selection);
+				selectRootElementPage = createSelectRootElementPage(selection);
+				if (isCreateFromExistingDomainModel()) {
+					// Init Model not Create a new one
+					setWindowTitle(Messages.InitModelWizard_init_papyrus_diagram);
+				}
+			}
+
+			@Override
+			public boolean isCreateFromExistingDomainModel() {
+				return true;
+			}
+
+		};
+
+	}
+
+
+	@Test
+	public void testOrderOfPages() {
+		// actual pages: [SelectDiagramCategory -> SelectDiagramCategoryPage, SelectStorageProvider -> SelectStorageProviderPage,
+		// NewPapyrusModel -> NewModelFilePage, NewCDOModel -> NewModelPage, SelectDiagramKind -> SelectDiagramKindPage, SelectRootPage -> SelectRootElementPage]
+		Class<?>[] expectedPages = new Class[] { SelectArchitectureContextPage.class, NewModelFilePage.class, SelectRepresentationKindPage.class, /* SelectRootElementPage.class, */ };
+
+		IWorkbenchWizard wizard = initWizardDialog();
+		testOrderOfPages(wizard, expectedPages);
+	}
+
+	@Test
+	public void testForSimpleModel() {
+		InitModelWizard wizard = new InitModelWizard() {
+
+			private boolean isInitFromExistingDomainModel;
+
+			// private SelectRootElementPage selectRootElementPage;
+
+			@Override
+			public void init(IWorkbench workbench, IStructuredSelection selection) {
+				URI uri = URI.createPlatformResourceURI(file.getFullPath().toString(), true);
+				isInitFromExistingDomainModel = isSupportedDomainModelResource(uri);
+				super.init(workbench, selection);
+				// selectRootElementPage = createSelectRootElementPage(selection);
+				if (isCreateFromExistingDomainModel()) {
+					// Init Model not Create a new one
+					setWindowTitle(Messages.InitModelWizard_init_papyrus_diagram);
+				}
+			}
+
+			@Override
+			public boolean isCreateFromExistingDomainModel() {
+				return true;
+			}
+
+		};
+		initWizardDialog(wizard);
+		NewModelFilePage page = getPage(wizard, NewModelFilePage.class);
+		assertEquals("model.di", page.getFileName());
+
+	}
+
+	@Test
+	public void testForModelWithDot() {
+		InitModelWizard wizard = new InitModelWizard() {
+
+			private boolean isInitFromExistingDomainModel;
+
+			private SelectRootElementPage selectRootElementPage;
+
+			@Override
+			public void init(IWorkbench workbench, IStructuredSelection selection) {
+				URI uri = URI.createPlatformResourceURI(fileWithDot.getFullPath().toString(), true);
+				isInitFromExistingDomainModel = isSupportedDomainModelResource(uri);
+				super.init(workbench, selection);
+				selectRootElementPage = createSelectRootElementPage(selection);
+				if (isCreateFromExistingDomainModel()) {
+					// Init Model not Create a new one
+					setWindowTitle(Messages.InitModelWizard_init_papyrus_diagram);
+				}
+			}
+
+			@Override
+			public boolean isCreateFromExistingDomainModel() {
+				return true;
+			}
+		};
+		initWizardDialog(wizard);
+		NewModelFilePage page = getPage(wizard, NewModelFilePage.class);
+		assertNotSame("model.model.di", page.getFileName());
+		// this should be fixed in the wizard to have the right name from the begining if the name contain a dot
+
+
+	}
+
+
+}
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestCreateModelWizard.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestCreateModelWizard.java
index c23772ae929..49c205d83a3 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestCreateModelWizard.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestCreateModelWizard.java
@@ -15,10 +15,11 @@ package org.eclipse.papyrus.uml.diagram.wizards;
 
 import static org.junit.Assert.assertEquals;
 
+import org.eclipse.papyrus.uml.architecture.UMLArchitectureContextIds;
 import org.eclipse.papyrus.uml.diagram.profile.CreateProfileModelCommand;
 import org.eclipse.papyrus.uml.diagram.wizards.pages.NewModelFilePage;
-import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramCategoryPage;
-import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramKindPage;
+import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectArchitectureContextPage;
+import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectRepresentationKindPage;
 import org.eclipse.papyrus.uml.diagram.wizards.wizards.InitModelWizard;
 import org.eclipse.ui.IWorkbenchWizard;
 import org.junit.Test;
@@ -42,7 +43,7 @@ public class TestCreateModelWizard extends TestNewModelWizardBase {
 	public void testOrderOfPages() {
 		// actual pages: [SelectDiagramCategory -> SelectDiagramCategoryPage, SelectStorageProvider -> SelectStorageProviderPage,
 		// NewPapyrusModel -> NewModelFilePage, NewCDOModel -> NewModelPage, SelectDiagramKind -> SelectDiagramKindPage]
-		Class<?>[] expectedPages = new Class[] { SelectDiagramCategoryPage.class, NewModelFilePage.class, SelectDiagramKindPage.class, };
+		Class<?>[] expectedPages = new Class[] { SelectArchitectureContextPage.class, NewModelFilePage.class, SelectRepresentationKindPage.class, };
 
 		IWorkbenchWizard wizard = initWizardDialog();
 		testOrderOfPages(wizard, expectedPages);
@@ -81,14 +82,14 @@ public class TestCreateModelWizard extends TestNewModelWizardBase {
 			}
 
 			@Override
-			protected String[] getDiagramCategoryIds() {
-				return new String[] { CreateProfileModelCommand.COMMAND_ID };
+			protected String[] getSelectedContexts() {
+				return new String[] { UMLArchitectureContextIds.Profile };
 			}
 
 		};
 
 		// ensure that the dialog would create a profile
-		settings.saveDefaultDiagramCategory(new String[] { "profile" });
+		settings.saveArchitectureContexts(new String[] { UMLArchitectureContextIds.Profile });
 
 		initWizardDialog(wizard);
 		NewModelFilePage page = getPage(wizard, NewModelFilePage.class);
@@ -106,8 +107,8 @@ public class TestCreateModelWizard extends TestNewModelWizardBase {
 			}
 
 			@Override
-			protected String[] getDiagramCategoryIds() {
-				return new String[] { "uml" };
+			protected String[] getSelectedContexts() {
+				return new String[] { UMLArchitectureContextIds.UML };
 			}
 
 		};
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestInitModelWizard.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestInitModelWizard.java
index a1bc29baca6..476f2f41e7a 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestInitModelWizard.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestInitModelWizard.java
@@ -15,10 +15,10 @@ package org.eclipse.papyrus.uml.diagram.wizards;
 
 import static org.junit.Assert.assertEquals;
 
-import org.eclipse.papyrus.uml.diagram.profile.CreateProfileModelCommand;
+import org.eclipse.papyrus.uml.architecture.UMLArchitectureContextIds;
 import org.eclipse.papyrus.uml.diagram.wizards.pages.NewModelFilePage;
-import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramCategoryPage;
-import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramKindPage;
+import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectArchitectureContextPage;
+import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectRepresentationKindPage;
 import org.eclipse.papyrus.uml.diagram.wizards.wizards.InitModelWizard;
 import org.eclipse.ui.IWorkbenchWizard;
 import org.junit.Test;
@@ -39,8 +39,8 @@ public class TestInitModelWizard extends TestNewModelWizardBase {
 
 
 			@Override
-			protected String[] getDiagramCategoryIds() {
-				return new String[] { "uml" };
+			protected String[] getSelectedContexts() {
+				return new String[] { "Software Engineering::UML" };
 			}
 
 			@Override
@@ -77,7 +77,7 @@ public class TestInitModelWizard extends TestNewModelWizardBase {
 	public void testOrderOfPages() {
 		// actual pages: [SelectDiagramCategory -> SelectDiagramCategoryPage, SelectStorageProvider -> SelectStorageProviderPage,
 		// NewPapyrusModel -> NewModelFilePage, NewCDOModel -> NewModelPage, SelectDiagramKind -> SelectDiagramKindPage, SelectRootPage -> SelectRootElementPage]
-		Class<?>[] expectedPages = new Class[] { SelectDiagramCategoryPage.class, NewModelFilePage.class, SelectDiagramKindPage.class, /* SelectRootElementPage.class, */ };
+		Class<?>[] expectedPages = new Class[] { SelectArchitectureContextPage.class, NewModelFilePage.class, SelectRepresentationKindPage.class, /* SelectRootElementPage.class, */ };
 
 		IWorkbenchWizard wizard = initWizardDialog();
 		testOrderOfPages(wizard, expectedPages);
@@ -101,14 +101,14 @@ public class TestInitModelWizard extends TestNewModelWizardBase {
 			}
 
 			@Override
-			protected String[] getDiagramCategoryIds() {
-				return new String[] { CreateProfileModelCommand.COMMAND_ID };
+			protected String[] getSelectedContexts() {
+				return new String[] { UMLArchitectureContextIds.Profile };
 			}
 
 		};
 
 		// ensure that the dialog would create a profile
-		settings.saveDefaultDiagramCategory(new String[] { "profile" });
+		settings.saveArchitectureContexts(new String[] { UMLArchitectureContextIds.Profile });
 
 		initWizardDialog(wizard);
 		NewModelFilePage page = getPage(wizard, NewModelFilePage.class);
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestNewProjectWizard.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestNewProjectWizard.java
index 6effb053757..118eaf0e5dd 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestNewProjectWizard.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards.tests/test/org/eclipse/papyrus/uml/diagram/wizards/TestNewProjectWizard.java
@@ -14,8 +14,8 @@
 package org.eclipse.papyrus.uml.diagram.wizards;
 
 import org.eclipse.papyrus.uml.diagram.wizards.pages.PapyrusProjectCreationPage;
-import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramCategoryPage;
-import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectDiagramKindPage;
+import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectArchitectureContextPage;
+import org.eclipse.papyrus.uml.diagram.wizards.pages.SelectRepresentationKindPage;
 import org.eclipse.papyrus.uml.diagram.wizards.wizards.NewPapyrusProjectWizard;
 import org.eclipse.ui.IWorkbenchWizard;
 import org.junit.Test;
@@ -33,7 +33,7 @@ public class TestNewProjectWizard extends TestNewModelWizardBase {
 	public void testOrderOfPages() {
 
 		// actual pages: [SelectDiagramCategory -> SelectDiagramCategoryPage, PapyrusNewProjectPage -> PapyrusProjectCreationPage, SelectDiagramKind -> SelectDiagramKindPage]
-		Class<?>[] expectedPages = new Class[] { SelectDiagramCategoryPage.class, PapyrusProjectCreationPage.class, SelectDiagramKindPage.class, };
+		Class<?>[] expectedPages = new Class[] { SelectArchitectureContextPage.class, PapyrusProjectCreationPage.class, SelectRepresentationKindPage.class, };
 
 		IWorkbenchWizard wizard = initWizardDialog();
 		testOrderOfPages(wizard, expectedPages);
diff --git a/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/META-INF/MANIFEST.MF
index d77a94c9b7a..e1524df2e07 100644
--- a/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.controlmode.tests/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@ Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.papyrus.infra.core;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.ui.workbench;bundle-version="[3.109.0,4.0.0)",
+ org.eclipse.ui.workbench;bundle-version="[3.108.0,4.0.0)",
  org.eclipse.papyrus.infra.emf.tests;bundle-version="[1.4.0,2.0.0)",
  org.eclipse.papyrus.uml.internationalization.tests;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.papyrus.infra.services.controlmode;bundle-version="[1.5.0,2.0.0)",
diff --git a/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/META-INF/MANIFEST.MF
index 6648f782830..2f08f414898 100644
--- a/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/internationalization/org.eclipse.papyrus.uml.internationalization.tests/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.eclipse.papyrus.infra.core;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.uml.internationalization;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.papyrus.uml.internationalization.utils;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.ui.workbench;bundle-version="[3.109.0,4.0.0)",
+ org.eclipse.ui.workbench;bundle-version="[3.108.0,4.0.0)",
  org.eclipse.papyrus.infra.emf.tests;bundle-version="[1.4.0,2.0.0)",
  org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)",
  org.eclipse.papyrus.infra.internationalization.common;bundle-version="[1.0.0,2.0.0)",
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/org.eclipse.papyrus.uml.nattable.generic.tests.launch b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/org.eclipse.papyrus.uml.nattable.generic.tests.launch
index 3b6b8cb5428..e9c3b18cb11 100755
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/org.eclipse.papyrus.uml.nattable.generic.tests.launch
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.tests/org.eclipse.papyrus.uml.nattable.generic.tests.launch
@@ -10,7 +10,7 @@
 <booleanAttribute key="clearws" value="true"/>
 <booleanAttribute key="clearwslog" value="false"/>
 <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
-<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="default" value="false"/>
 <booleanAttribute key="includeOptional" value="true"/>
 <stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
@@ -23,6 +23,7 @@
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.uml.nattable.generic.tests.tests.AllTests"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
@@ -32,6 +33,8 @@
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.eclipse.platform.ide"/>
 <booleanAttribute key="run_in_ui_thread" value="true"/>
+<stringAttribute key="selected_target_plugins" value="ca.odell.glazedlists@default:default,ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.google.gerrit.common@default:default,com.google.gerrit.prettify@default:default,com.google.gerrit.reviewdb@default:default,com.google.gson@default:default,com.google.guava@default:default,com.google.gwt.servlet@default:default,com.google.gwtjsonrpc@default:default,com.google.gwtorm@default:default,com.google.inject.multibindings@default:false,com.google.inject@default:default,com.gradleware.tooling.client@default:default,com.gradleware.tooling.model@default:default,com.gradleware.tooling.utils@default:default,com.ibm.icu@default:default,com.jcraft.jsch@default:default,com.sun.el@default:default,fr.obeo.releng.targetplatform.ui@default:default,fr.obeo.releng.targetplatform@default:default,javaewah@default:default,javax.annotation@default:default,javax.el@default:default,javax.inject@default:default,javax.servlet*3.0.0.v201112011016@default:default,javax.servlet*3.1.0.v201410161800@default:default,javax.servlet.jsp@default:default,javax.xml@default:default,lpg.runtime.java@default:default,net.sourceforge.nattable.core@default:default,org.antlr.runtime*3.2.0.v201101311130@default:default,org.antlr.runtime*4.3.0.v201502022030@default:default,org.apache.ant@default:default,org.apache.batik.bridge@default:default,org.apache.batik.css*1.6.0.v201011041432@default:default,org.apache.batik.css*1.7.0.v201011041433@default:default,org.apache.batik.dom.svg@default:default,org.apache.batik.dom@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.parser@default:default,org.apache.batik.pdf@default:default,org.apache.batik.svggen@default:default,org.apache.batik.transcoder@default:default,org.apache.batik.util*1.6.0.v201011041432@default:default,org.apache.batik.util*1.7.0.v201011041433@default:default,org.apache.batik.util.gui*1.6.0.v201011041432@default:default,org.apache.batik.util.gui*1.7.0.v200903091627@default:default,org.apache.batik.xml@default:default,org.apache.commons.cli@default:default,org.apache.commons.codec@default:default,org.apache.commons.compress@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.io@default:default,org.apache.commons.jxpath*1.2.0.v20080604-1500@default:default,org.apache.commons.jxpath*1.3.0.v200911051830@default:default,org.apache.commons.lang3@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.commons.math@default:default,org.apache.commons.pool@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.httpcomponents.httpclient*4.3.6.v201411290715@default:default,org.apache.httpcomponents.httpclient*4.3.6.v201511171540@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.jasper.glassfish@default:default,org.apache.log4j@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.apache.solr.client.solrj@default:default,org.apache.ws.commons.util@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.apache.xmlrpc@default:default,org.eclipse.acceleo.annotations@default:default,org.eclipse.acceleo.common.ide@default:default,org.eclipse.acceleo.common.ui@default:default,org.eclipse.acceleo.common@default:default,org.eclipse.acceleo.engine@default:default,org.eclipse.acceleo.ide.ui@default:default,org.eclipse.acceleo.model@default:default,org.eclipse.acceleo.parser@default:default,org.eclipse.acceleo.profiler@default:default,org.eclipse.acceleo.query@default:default,org.eclipse.acceleo.traceability.model@default:default,org.eclipse.acceleo.traceability@default:default,org.eclipse.acceleo.ui.interpreter@default:default,org.eclipse.aether.api@default:default,org.eclipse.aether.connector.basic@default:default,org.eclipse.aether.impl@default:default,org.eclipse.aether.maven@default:default,org.eclipse.aether.spi@default:default,org.eclipse.aether.transport.file@default:default,org.eclipse.aether.transport.http@default:default,org.eclipse.aether.util@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.b3.aggregator.edit@default:default,org.eclipse.b3.aggregator.editor@default:default,org.eclipse.b3.aggregator.engine.maven@default:default,org.eclipse.b3.aggregator.engine@default:default,org.eclipse.b3.aggregator.legacy.ui@default:default,org.eclipse.b3.aggregator.legacy@default:default,org.eclipse.b3.aggregator@default:default,org.eclipse.b3.cli@default:default,org.eclipse.b3.p2.edit@default:default,org.eclipse.b3.p2.maven.indexer@default:default,org.eclipse.b3.p2.maven@default:default,org.eclipse.b3.p2@default:default,org.eclipse.b3.util@default:default,org.eclipse.buckminster.osgi.filter@default:default,org.eclipse.buildship.branding@default:default,org.eclipse.buildship.core@default:default,org.eclipse.buildship.stsmigration@default:default,org.eclipse.buildship.ui@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.cvs@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.draw2d.doc.isv@default:default,org.eclipse.draw2d@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.emf.xpath@default:default,org.eclipse.e4.tools.compat@default:default,org.eclipse.e4.tools.emf.editor3x@default:default,org.eclipse.e4.tools.emf.ui@default:default,org.eclipse.e4.tools.jdt.templates@default:default,org.eclipse.e4.tools.services@default:default,org.eclipse.e4.tools@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.dialogs@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt.cocoa@default:false,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.httpclient4.ssl@default:false,org.eclipse.ecf.provider.filetransfer.httpclient4@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.eef.common.ui@default:default,org.eclipse.eef.common@default:default,org.eclipse.eef.core.ext.widgets.reference@default:default,org.eclipse.eef.core@default:default,org.eclipse.eef.ext.widgets.reference@default:default,org.eclipse.eef.ide.ui.ext.widgets.reference@default:default,org.eclipse.eef.ide.ui.properties@default:default,org.eclipse.eef.ide.ui@default:default,org.eclipse.eef.ide@default:default,org.eclipse.eef.properties.ui.legacy@default:default,org.eclipse.eef.properties.ui@default:default,org.eclipse.eef@default:default,org.eclipse.egit.core@default:default,org.eclipse.egit.doc@default:default,org.eclipse.egit.mylyn.ui@default:default,org.eclipse.egit.ui@default:default,org.eclipse.egit@default:default,org.eclipse.emf.ant@default:default,org.eclipse.emf.cdo.admin@default:default,org.eclipse.emf.cdo.common.db@default:default,org.eclipse.emf.cdo.common@default:default,org.eclipse.emf.cdo.compare@default:default,org.eclipse.emf.cdo.defs@default:default,org.eclipse.emf.cdo.doc@default:default,org.eclipse.emf.cdo.ecore.retrofit@default:false,org.eclipse.emf.cdo.edit@default:default,org.eclipse.emf.cdo.examples.installer@default:default,org.eclipse.emf.cdo.explorer.ui@default:default,org.eclipse.emf.cdo.explorer@default:default,org.eclipse.emf.cdo.expressions.edit@default:default,org.eclipse.emf.cdo.expressions.editor@default:default,org.eclipse.emf.cdo.expressions@default:default,org.eclipse.emf.cdo.migrator@default:default,org.eclipse.emf.cdo.net4j@default:default,org.eclipse.emf.cdo.sdk@default:default,org.eclipse.emf.cdo.security.edit@default:default,org.eclipse.emf.cdo.security.editor@default:default,org.eclipse.emf.cdo.security.ui@default:default,org.eclipse.emf.cdo.security@default:default,org.eclipse.emf.cdo.server.admin@default:default,org.eclipse.emf.cdo.server.db@default:default,org.eclipse.emf.cdo.server.lissome@default:default,org.eclipse.emf.cdo.server.mongodb@default:default,org.eclipse.emf.cdo.server.net4j@default:default,org.eclipse.emf.cdo.server.ocl@default:default,org.eclipse.emf.cdo.server.product@default:default,org.eclipse.emf.cdo.server.security@default:default,org.eclipse.emf.cdo.server@default:default,org.eclipse.emf.cdo.transfer.repository@default:default,org.eclipse.emf.cdo.transfer.ui@default:default,org.eclipse.emf.cdo.transfer.workspace.ui@default:default,org.eclipse.emf.cdo.transfer.workspace@default:default,org.eclipse.emf.cdo.transfer@default:default,org.eclipse.emf.cdo.ui.admin@default:default,org.eclipse.emf.cdo.ui.compare@default:default,org.eclipse.emf.cdo.ui.defs@default:default,org.eclipse.emf.cdo.ui.shared@default:default,org.eclipse.emf.cdo.ui.team@default:default,org.eclipse.emf.cdo.ui@default:default,org.eclipse.emf.cdo.workspace@default:default,org.eclipse.emf.cdo@default:default,org.eclipse.emf.cheatsheets@default:default,org.eclipse.emf.codegen.ecore.ui@default:default,org.eclipse.emf.codegen.ecore.xtext@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.codegen.ui@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.compare.diagram.edit@default:default,org.eclipse.emf.compare.diagram.ide.ui.papyrus@default:default,org.eclipse.emf.compare.diagram.ide.ui@default:default,org.eclipse.emf.compare.diagram.papyrus@default:default,org.eclipse.emf.compare.diagram@default:default,org.eclipse.emf.compare.doc@default:default,org.eclipse.emf.compare.edit@default:default,org.eclipse.emf.compare.egit.ui@default:default,org.eclipse.emf.compare.egit@default:default,org.eclipse.emf.compare.ide.ui@default:default,org.eclipse.emf.compare.ide@default:default,org.eclipse.emf.compare.rcp.ui@default:default,org.eclipse.emf.compare.rcp@default:default,org.eclipse.emf.compare.uml2.edit.papyrus@default:default,org.eclipse.emf.compare.uml2.edit@default:default,org.eclipse.emf.compare.uml2.rcp.ui@default:default,org.eclipse.emf.compare.uml2.rcp@default:default,org.eclipse.emf.compare.uml2@default:default,org.eclipse.emf.compare@default:default,org.eclipse.emf.converter@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.doc@default:default,org.eclipse.emf.ecore.change.edit@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.emf.ecore.xcore.lib@default:default,org.eclipse.emf.ecore.xcore@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.eef.runtime@default:default,org.eclipse.emf.example.installer@default:default,org.eclipse.emf.examples.library@default:default,org.eclipse.emf.exporter@default:default,org.eclipse.emf.facet.aggregate.doc@default:default,org.eclipse.emf.facet.aggregate.metamodel.notgenerated@default:default,org.eclipse.emf.facet.aggregate.metamodel@default:default,org.eclipse.emf.facet.aggregate.tests@default:default,org.eclipse.emf.facet.capabilities@default:default,org.eclipse.emf.facet.common.core@default:default,org.eclipse.emf.facet.common.sdk.core@default:default,org.eclipse.emf.facet.common.sdk.ui@default:default,org.eclipse.emf.facet.common.ui@default:default,org.eclipse.emf.facet.custom.core.tests@default:default,org.eclipse.emf.facet.custom.core@default:default,org.eclipse.emf.facet.custom.doc@default:default,org.eclipse.emf.facet.custom.metamodel.edit@default:default,org.eclipse.emf.facet.custom.metamodel.editor@default:default,org.eclipse.emf.facet.custom.metamodel@default:default,org.eclipse.emf.facet.custom.sdk.core@default:default,org.eclipse.emf.facet.custom.sdk.tests@default:default,org.eclipse.emf.facet.custom.sdk.ui@default:default,org.eclipse.emf.facet.custom.tests.metamodel@default:default,org.eclipse.emf.facet.custom.tests@default:default,org.eclipse.emf.facet.custom.ui@default:default,org.eclipse.emf.facet.dev.core@default:default,org.eclipse.emf.facet.dev.ui@default:default,org.eclipse.emf.facet.doc.api.report@default:default,org.eclipse.emf.facet.doc.metric.report@default:default,org.eclipse.emf.facet.doc.test.report@default:default,org.eclipse.emf.facet.doc@default:default,org.eclipse.emf.facet.ecore.ui@default:default,org.eclipse.emf.facet.ecore@default:default,org.eclipse.emf.facet.efacet.core@default:default,org.eclipse.emf.facet.efacet.doc@default:default,org.eclipse.emf.facet.efacet.edit.core@default:default,org.eclipse.emf.facet.efacet.edit.ui@default:default,org.eclipse.emf.facet.efacet.examples.library.core@default:default,org.eclipse.emf.facet.efacet.examples.library.metamodel.edit@default:default,org.eclipse.emf.facet.efacet.examples.library.metamodel@default:default,org.eclipse.emf.facet.efacet.metamodel.edit@default:default,org.eclipse.emf.facet.efacet.metamodel.editor@default:default,org.eclipse.emf.facet.efacet.metamodel@default:default,org.eclipse.emf.facet.efacet.sdk.ui@default:default,org.eclipse.emf.facet.efacet.tests.metamodel@default:default,org.eclipse.emf.facet.efacet.tests@default:default,org.eclipse.emf.facet.efacet.ui@default:default,org.eclipse.emf.facet.query.java.core@default:default,org.eclipse.emf.facet.query.java.metamodel@default:default,org.eclipse.emf.facet.query.java.sdk.ui@default:default,org.eclipse.emf.facet.query.java.tests@default:default,org.eclipse.emf.facet.query.java.ui.tests@default:default,org.eclipse.emf.facet.query.java.ui@default:default,org.eclipse.emf.facet.query.ocl.core@default:default,org.eclipse.emf.facet.query.ocl.metamodel@default:default,org.eclipse.emf.facet.query.ocl.sdk.ui@default:default,org.eclipse.emf.facet.tests@default:default,org.eclipse.emf.facet.util.core.tests@default:default,org.eclipse.emf.facet.util.core@default:default,org.eclipse.emf.facet.util.efacet.ocl.core@default:default,org.eclipse.emf.facet.util.emf.catalog.metamodel@default:default,org.eclipse.emf.facet.util.emf.catalog@default:default,org.eclipse.emf.facet.util.emf.core.tests@default:default,org.eclipse.emf.facet.util.emf.core@default:default,org.eclipse.emf.facet.util.emf.doc@default:default,org.eclipse.emf.facet.util.emf.ui.tests@default:default,org.eclipse.emf.facet.util.emf.ui@default:default,org.eclipse.emf.facet.util.jface.ui@default:default,org.eclipse.emf.facet.util.junit.core@default:default,org.eclipse.emf.facet.util.pde.core@default:default,org.eclipse.emf.facet.util.swt@default:default,org.eclipse.emf.facet.util.tests.swtbot@default:default,org.eclipse.emf.facet.util.ui@default:default,org.eclipse.emf.facet.widgets.celleditors.ecore.tests.samplemm@default:default,org.eclipse.emf.facet.widgets.celleditors.ecore@default:default,org.eclipse.emf.facet.widgets.celleditors.edit@default:default,org.eclipse.emf.facet.widgets.celleditors.editor@default:default,org.eclipse.emf.facet.widgets.celleditors@default:default,org.eclipse.emf.facet.widgets.table.doc@default:default,org.eclipse.emf.facet.widgets.table.examples.library.core@default:default,org.eclipse.emf.facet.widgets.table.metamodel.edit@default:default,org.eclipse.emf.facet.widgets.table.metamodel@default:default,org.eclipse.emf.facet.widgets.table.tests@default:default,org.eclipse.emf.facet.widgets.table.ui.nattable@default:default,org.eclipse.emf.facet.widgets.table.ui.workbench@default:default,org.eclipse.emf.facet.widgets.table.ui@default:default,org.eclipse.emf.facet.widgets@default:default,org.eclipse.emf.importer.ecore@default:default,org.eclipse.emf.importer.java@default:default,org.eclipse.emf.importer.rose@default:default,org.eclipse.emf.importer@default:default,org.eclipse.emf.mapping.ecore.editor@default:default,org.eclipse.emf.mapping.ecore2ecore.editor@default:default,org.eclipse.emf.mapping.ecore2ecore@default:default,org.eclipse.emf.mapping.ecore2xml.ui@default:default,org.eclipse.emf.mapping.ecore2xml@default:default,org.eclipse.emf.mapping.ecore@default:default,org.eclipse.emf.mapping.ui@default:default,org.eclipse.emf.mapping@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.emf.mwe2.language.ui@default:default,org.eclipse.emf.mwe2.language@default:default,org.eclipse.emf.mwe2.launch.ui@default:default,org.eclipse.emf.mwe2.launch@default:default,org.eclipse.emf.mwe2.lib@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.emf.query.doc@default:default,org.eclipse.emf.query.examples@default:default,org.eclipse.emf.query.ocl@default:default,org.eclipse.emf.query@default:default,org.eclipse.emf.transaction.doc@default:default,org.eclipse.emf.transaction.examples@default:default,org.eclipse.emf.transaction.ui@default:default,org.eclipse.emf.transaction@default:default,org.eclipse.emf.validation.doc@default:default,org.eclipse.emf.validation.examples@default:default,org.eclipse.emf.validation.ocl@default:default,org.eclipse.emf.validation.ui.ide@default:default,org.eclipse.emf.validation.ui@default:default,org.eclipse.emf.validation@default:default,org.eclipse.emf.workspace.doc@default:default,org.eclipse.emf.workspace.ui@default:default,org.eclipse.emf.workspace@default:default,org.eclipse.emf@default:default,org.eclipse.epp.logging.aeri.core@default:default,org.eclipse.epp.logging.aeri.ide@default:default,org.eclipse.epp.mpc.core@default:default,org.eclipse.epp.mpc.help.ui@default:default,org.eclipse.epp.mpc.ui@default:default,org.eclipse.epp.package.committers@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.equinox.launcher.cocoa.macosx.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.equinox.p2.discovery.compatibility@default:default,org.eclipse.equinox.p2.discovery@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,org.eclipse.equinox.p2.ui.discovery@default:default,org.eclipse.equinox.p2.ui.importexport@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.macosx@default:false,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.gef.doc.isv@default:default,org.eclipse.gef.examples.ui.pde@default:default,org.eclipse.gef@default:default,org.eclipse.gmf.bridge.trace@default:default,org.eclipse.gmf.bridge.ui.dashboard@default:default,org.eclipse.gmf.bridge.ui@default:default,org.eclipse.gmf.bridge@default:default,org.eclipse.gmf.codegen.edit@default:default,org.eclipse.gmf.codegen.ui@default:default,org.eclipse.gmf.codegen.xtend.ui@default:default,org.eclipse.gmf.codegen.xtend@default:default,org.eclipse.gmf.codegen@default:default,org.eclipse.gmf.common@default:default,org.eclipse.gmf.doc.ui@default:default,org.eclipse.gmf.doc@default:default,org.eclipse.gmf.ecore.editor@default:default,org.eclipse.gmf.examples.runtime.diagram.geoshapes@default:default,org.eclipse.gmf.examples.runtime.diagram.logic.model.edit@default:default,org.eclipse.gmf.examples.runtime.diagram.logic.model.editor@default:default,org.eclipse.gmf.examples.runtime.diagram.logic.model@default:default,org.eclipse.gmf.examples.runtime.diagram.logic@default:default,org.eclipse.gmf.examples.runtime.ui.pde@default:default,org.eclipse.gmf.examples.runtime@default:default,org.eclipse.gmf.graphdef.codegen.ui@default:default,org.eclipse.gmf.graphdef.codegen@default:default,org.eclipse.gmf.graphdef.edit@default:default,org.eclipse.gmf.graphdef@default:default,org.eclipse.gmf.map.edit@default:default,org.eclipse.gmf.map@default:default,org.eclipse.gmf.runtime.common.core@default:default,org.eclipse.gmf.runtime.common.ui.action.ide@default:default,org.eclipse.gmf.runtime.common.ui.action@default:default,org.eclipse.gmf.runtime.common.ui.printing.win32@default:false,org.eclipse.gmf.runtime.common.ui.printing@default:default,org.eclipse.gmf.runtime.common.ui.services.action@default:default,org.eclipse.gmf.runtime.common.ui.services.dnd.ide@default:default,org.eclipse.gmf.runtime.common.ui.services.dnd@default:default,org.eclipse.gmf.runtime.common.ui.services.properties@default:default,org.eclipse.gmf.runtime.common.ui.services@default:default,org.eclipse.gmf.runtime.common.ui@default:default,org.eclipse.gmf.runtime.diagram.core@default:default,org.eclipse.gmf.runtime.diagram.ui.actions@default:default,org.eclipse.gmf.runtime.diagram.ui.dnd@default:default,org.eclipse.gmf.runtime.diagram.ui.geoshapes@default:default,org.eclipse.gmf.runtime.diagram.ui.printing.render@default:default,org.eclipse.gmf.runtime.diagram.ui.printing@default:default,org.eclipse.gmf.runtime.diagram.ui.properties@default:default,org.eclipse.gmf.runtime.diagram.ui.providers.ide@default:default,org.eclipse.gmf.runtime.diagram.ui.providers@default:default,org.eclipse.gmf.runtime.diagram.ui.render@default:default,org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide@default:default,org.eclipse.gmf.runtime.diagram.ui.resources.editor@default:default,org.eclipse.gmf.runtime.diagram.ui@default:default,org.eclipse.gmf.runtime.draw2d.ui.render.awt@default:default,org.eclipse.gmf.runtime.draw2d.ui.render@default:default,org.eclipse.gmf.runtime.draw2d.ui@default:default,org.eclipse.gmf.runtime.emf.clipboard.core@default:default,org.eclipse.gmf.runtime.emf.commands.core@default:default,org.eclipse.gmf.runtime.emf.core@default:default,org.eclipse.gmf.runtime.emf.type.core@default:default,org.eclipse.gmf.runtime.emf.type.ui@default:default,org.eclipse.gmf.runtime.emf.ui.properties@default:default,org.eclipse.gmf.runtime.emf.ui@default:default,org.eclipse.gmf.runtime.gef.ui@default:default,org.eclipse.gmf.runtime.lite.svg@default:default,org.eclipse.gmf.runtime.notation.edit@default:default,org.eclipse.gmf.runtime.notation.providers@default:default,org.eclipse.gmf.runtime.notation.sdk@default:default,org.eclipse.gmf.runtime.notation@default:default,org.eclipse.gmf.runtime.sdk@default:default,org.eclipse.gmf.sdk@default:default,org.eclipse.gmf.tooldef.edit@default:default,org.eclipse.gmf.tooldef@default:default,org.eclipse.gmf.tooling.runtime@default:default,org.eclipse.gmf.tooling@default:default,org.eclipse.gmf.validate@default:default,org.eclipse.gmf.xpand.editor@default:default,org.eclipse.gmf.xpand.qvtlibrary@default:default,org.eclipse.gmf.xpand@default:default,org.eclipse.gmf@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help.webapp@default:default,org.eclipse.help@default:default,org.eclipse.jdt.annotation*1.1.100.v20160418-1457@default:default,org.eclipse.jdt.annotation*2.1.0.v20160418-1457@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.doc.isv@default:default,org.eclipse.jdt.doc.user@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching.macosx@default:default,org.eclipse.jdt.launching.ui.macosx@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt@default:default,org.eclipse.jem.util@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.jgit.archive@default:default,org.eclipse.jgit.http.apache@default:default,org.eclipse.jgit@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.m2e.archetype.common@default:default,org.eclipse.m2e.core.ui@default:default,org.eclipse.m2e.core@default:default,org.eclipse.m2e.discovery@default:default,org.eclipse.m2e.editor.xml@default:default,org.eclipse.m2e.editor@default:default,org.eclipse.m2e.importer@default:default,org.eclipse.m2e.jdt.ui@default:false,org.eclipse.m2e.jdt@default:default,org.eclipse.m2e.launching@default:default,org.eclipse.m2e.lifecyclemapping.defaults@default:default,org.eclipse.m2e.maven.indexer@default:default,org.eclipse.m2e.maven.runtime.slf4j.simple@default:default,org.eclipse.m2e.maven.runtime@default:default,org.eclipse.m2e.model.edit@default:default,org.eclipse.m2e.profiles.core@default:default,org.eclipse.m2e.profiles.ui@default:default,org.eclipse.m2e.refactoring@default:default,org.eclipse.m2e.scm@default:default,org.eclipse.m2e.workspace.cli@default:default,org.eclipse.m2m.qvt.oml.common.ui@default:default,org.eclipse.m2m.qvt.oml.common@default:default,org.eclipse.m2m.qvt.oml.cst.parser@default:default,org.eclipse.m2m.qvt.oml.debug.core@default:default,org.eclipse.m2m.qvt.oml.debug.ui@default:default,org.eclipse.m2m.qvt.oml.doc@default:default,org.eclipse.m2m.qvt.oml.ecore.imperativeocl@default:default,org.eclipse.m2m.qvt.oml.editor.ui@default:default,org.eclipse.m2m.qvt.oml.emf.util.ui@default:default,org.eclipse.m2m.qvt.oml.emf.util@default:default,org.eclipse.m2m.qvt.oml.ocl@default:default,org.eclipse.m2m.qvt.oml.project@default:default,org.eclipse.m2m.qvt.oml.runtime.jdt@default:default,org.eclipse.m2m.qvt.oml.runtime.ui@default:default,org.eclipse.m2m.qvt.oml.runtime@default:default,org.eclipse.m2m.qvt.oml.samples@default:default,org.eclipse.m2m.qvt.oml.trace.edit@default:default,org.eclipse.m2m.qvt.oml.ui@default:default,org.eclipse.m2m.qvt.oml@default:default,org.eclipse.mylyn.bugzilla.core@default:default,org.eclipse.mylyn.bugzilla.ui@default:default,org.eclipse.mylyn.builds.core@default:default,org.eclipse.mylyn.builds.ui@default:default,org.eclipse.mylyn.commons.core@default:default,org.eclipse.mylyn.commons.identity.core@default:default,org.eclipse.mylyn.commons.net@default:default,org.eclipse.mylyn.commons.notifications.core@default:default,org.eclipse.mylyn.commons.notifications.feed@default:default,org.eclipse.mylyn.commons.notifications.ui@default:default,org.eclipse.mylyn.commons.repositories.core@default:default,org.eclipse.mylyn.commons.repositories.http.core@default:default,org.eclipse.mylyn.commons.repositories.ui@default:default,org.eclipse.mylyn.commons.screenshots@default:default,org.eclipse.mylyn.commons.ui@default:default,org.eclipse.mylyn.commons.workbench@default:default,org.eclipse.mylyn.commons.xmlrpc@default:default,org.eclipse.mylyn.context.core@default:default,org.eclipse.mylyn.context.tasks.ui@default:default,org.eclipse.mylyn.context.ui@default:default,org.eclipse.mylyn.debug.ui@default:default,org.eclipse.mylyn.discovery.core@default:default,org.eclipse.mylyn.discovery.ui@default:default,org.eclipse.mylyn.gerrit.core@default:default,org.eclipse.mylyn.gerrit.dashboard.core@default:default,org.eclipse.mylyn.gerrit.dashboard.ui@default:default,org.eclipse.mylyn.gerrit.ui@default:default,org.eclipse.mylyn.git.core@default:default,org.eclipse.mylyn.git.ui@default:default,org.eclipse.mylyn.hudson.core@default:default,org.eclipse.mylyn.hudson.ui@default:default,org.eclipse.mylyn.ide.ant@default:default,org.eclipse.mylyn.ide.ui@default:default,org.eclipse.mylyn.java.tasks@default:default,org.eclipse.mylyn.java.ui@default:default,org.eclipse.mylyn.monitor.core@default:default,org.eclipse.mylyn.monitor.ui@default:default,org.eclipse.mylyn.resources.ui@default:default,org.eclipse.mylyn.reviews.core@default:default,org.eclipse.mylyn.reviews.edit@default:default,org.eclipse.mylyn.reviews.ui@default:default,org.eclipse.mylyn.tasks.core@default:default,org.eclipse.mylyn.tasks.index.core@default:default,org.eclipse.mylyn.tasks.index.ui@default:default,org.eclipse.mylyn.tasks.search@default:default,org.eclipse.mylyn.tasks.ui@default:default,org.eclipse.mylyn.team.ui@default:default,org.eclipse.mylyn.versions.core@default:default,org.eclipse.mylyn.versions.ui@default:default,org.eclipse.mylyn.wikitext.asciidoc.core@default:default,org.eclipse.mylyn.wikitext.asciidoc.ui@default:default,org.eclipse.mylyn.wikitext.confluence.core@default:default,org.eclipse.mylyn.wikitext.confluence.ui@default:default,org.eclipse.mylyn.wikitext.context.ui@default:default,org.eclipse.mylyn.wikitext.core.ant@default:default,org.eclipse.mylyn.wikitext.core.osgi@default:default,org.eclipse.mylyn.wikitext.core@default:default,org.eclipse.mylyn.wikitext.help.ui@default:default,org.eclipse.mylyn.wikitext.html.core@default:default,org.eclipse.mylyn.wikitext.markdown.core@default:default,org.eclipse.mylyn.wikitext.markdown.ui@default:default,org.eclipse.mylyn.wikitext.mediawiki.core.ant@default:default,org.eclipse.mylyn.wikitext.mediawiki.core@default:default,org.eclipse.mylyn.wikitext.mediawiki.ui@default:default,org.eclipse.mylyn.wikitext.tasks.ui@default:default,org.eclipse.mylyn.wikitext.textile.core@default:default,org.eclipse.mylyn.wikitext.textile.ui@default:default,org.eclipse.mylyn.wikitext.tracwiki.core@default:default,org.eclipse.mylyn.wikitext.tracwiki.ui@default:default,org.eclipse.mylyn.wikitext.twiki.core@default:default,org.eclipse.mylyn.wikitext.twiki.ui@default:default,org.eclipse.mylyn.wikitext.ui@default:default,org.eclipse.nebula.widgets.nattable.core@default:default,org.eclipse.nebula.widgets.nattable.extension.glazedlists@default:default,org.eclipse.nebula.widgets.nattable.extension.nebula@default:default,org.eclipse.nebula.widgets.richtext@default:default,org.eclipse.nebula.widgets.tablecombo@default:default,org.eclipse.net4j.db.doc@default:default,org.eclipse.net4j.db.h2@default:default,org.eclipse.net4j.db.jdbc@default:default,org.eclipse.net4j.db@default:default,org.eclipse.net4j.debug@default:default,org.eclipse.net4j.defs@default:default,org.eclipse.net4j.doc@default:default,org.eclipse.net4j.examples.installer@default:default,org.eclipse.net4j.http.common@default:default,org.eclipse.net4j.http.server@default:default,org.eclipse.net4j.http@default:default,org.eclipse.net4j.jvm@default:default,org.eclipse.net4j.sdk@default:default,org.eclipse.net4j.tcp@default:default,org.eclipse.net4j.ui.defs@default:default,org.eclipse.net4j.ui.shared@default:default,org.eclipse.net4j.ui@default:default,org.eclipse.net4j.util.defs@default:default,org.eclipse.net4j.util.doc@default:default,org.eclipse.net4j.util.ui@default:default,org.eclipse.net4j.util@default:default,org.eclipse.net4j@default:default,org.eclipse.ocl.common.ui@default:default,org.eclipse.ocl.common@default:default,org.eclipse.ocl.doc@default:default,org.eclipse.ocl.ecore.edit@default:default,org.eclipse.ocl.ecore.tests@default:default,org.eclipse.ocl.ecore@default:default,org.eclipse.ocl.edit@default:default,org.eclipse.ocl.examples.classic@default:default,org.eclipse.ocl.examples.codegen@default:default,org.eclipse.ocl.examples.debug.ui@default:default,org.eclipse.ocl.examples.debug.vm.ui@default:default,org.eclipse.ocl.examples.debug.vm@default:default,org.eclipse.ocl.examples.debug@default:default,org.eclipse.ocl.examples.domain@default:default,org.eclipse.ocl.examples.emf.validation.validity.ui@default:default,org.eclipse.ocl.examples.emf.validation.validity@default:default,org.eclipse.ocl.examples.eventmanager.tests@default:default,org.eclipse.ocl.examples.eventmanager@default:default,org.eclipse.ocl.examples.impactanalyzer.testmodel.company@default:default,org.eclipse.ocl.examples.impactanalyzer.testmodel.ngpm@default:default,org.eclipse.ocl.examples.impactanalyzer.tests@default:default,org.eclipse.ocl.examples.impactanalyzer.testutils@default:default,org.eclipse.ocl.examples.impactanalyzer.ui@default:default,org.eclipse.ocl.examples.impactanalyzer.util@default:default,org.eclipse.ocl.examples.impactanalyzer@default:default,org.eclipse.ocl.examples.interpreter@default:default,org.eclipse.ocl.examples.library@default:default,org.eclipse.ocl.examples.pivot@default:default,org.eclipse.ocl.examples.standalone@default:default,org.eclipse.ocl.examples.tests@default:default,org.eclipse.ocl.examples.testutils@default:default,org.eclipse.ocl.examples.ui@default:default,org.eclipse.ocl.examples.uml25@default:default,org.eclipse.ocl.examples.unified@default:default,org.eclipse.ocl.examples.validity.test@default:default,org.eclipse.ocl.examples.validity@default:default,org.eclipse.ocl.examples.xtext.base.ui@default:default,org.eclipse.ocl.examples.xtext.base@default:default,org.eclipse.ocl.examples.xtext.completeocl.ui@default:default,org.eclipse.ocl.examples.xtext.completeocl@default:default,org.eclipse.ocl.examples.xtext.console@default:default,org.eclipse.ocl.examples.xtext.essentialocl.ui@default:default,org.eclipse.ocl.examples.xtext.essentialocl@default:default,org.eclipse.ocl.examples.xtext.markup.ui@default:default,org.eclipse.ocl.examples.xtext.markup@default:default,org.eclipse.ocl.examples.xtext.oclinecore.ui@default:default,org.eclipse.ocl.examples.xtext.oclinecore@default:default,org.eclipse.ocl.examples.xtext.oclstdlib.ui@default:default,org.eclipse.ocl.examples.xtext.oclstdlib@default:default,org.eclipse.ocl.examples.xtext.tests@default:default,org.eclipse.ocl.examples@default:default,org.eclipse.ocl.master@default:default,org.eclipse.ocl.pivot.ui@default:default,org.eclipse.ocl.pivot.uml@default:default,org.eclipse.ocl.pivot@default:default,org.eclipse.ocl.tests@default:default,org.eclipse.ocl.ui@default:default,org.eclipse.ocl.uml.edit@default:default,org.eclipse.ocl.uml.tests@default:default,org.eclipse.ocl.uml.ui@default:default,org.eclipse.ocl.uml@default:default,org.eclipse.ocl.xtext.base.ui@default:default,org.eclipse.ocl.xtext.base@default:default,org.eclipse.ocl.xtext.completeocl.ui@default:default,org.eclipse.ocl.xtext.completeocl@default:default,org.eclipse.ocl.xtext.essentialocl.ui@default:default,org.eclipse.ocl.xtext.essentialocl@default:default,org.eclipse.ocl.xtext.markup.ui@default:default,org.eclipse.ocl.xtext.markup@default:default,org.eclipse.ocl.xtext.oclinecore.ui@default:default,org.eclipse.ocl.xtext.oclinecore@default:default,org.eclipse.ocl.xtext.oclstdlib.ui@default:default,org.eclipse.ocl.xtext.oclstdlib@default:default,org.eclipse.ocl@default:default,org.eclipse.oomph.base.edit@default:default,org.eclipse.oomph.base@default:default,org.eclipse.oomph.extractor.lib@default:default,org.eclipse.oomph.jreinfo.ui@default:default,org.eclipse.oomph.jreinfo@default:default,org.eclipse.oomph.p2.core@default:default,org.eclipse.oomph.p2.doc@default:default,org.eclipse.oomph.p2.edit@default:default,org.eclipse.oomph.p2.ui@default:default,org.eclipse.oomph.p2@default:default,org.eclipse.oomph.predicates.edit@default:default,org.eclipse.oomph.predicates@default:default,org.eclipse.oomph.preferences.edit@default:default,org.eclipse.oomph.preferences.editor@default:default,org.eclipse.oomph.preferences@default:default,org.eclipse.oomph.projectconfig.edit@default:default,org.eclipse.oomph.projectconfig.editor@default:default,org.eclipse.oomph.projectconfig@default:default,org.eclipse.oomph.resources.edit@default:default,org.eclipse.oomph.resources@default:default,org.eclipse.oomph.setup.core@default:default,org.eclipse.oomph.setup.doc@default:default,org.eclipse.oomph.setup.edit@default:default,org.eclipse.oomph.setup.editor@default:default,org.eclipse.oomph.setup.git.edit@default:default,org.eclipse.oomph.setup.git@default:default,org.eclipse.oomph.setup.jdt.edit@default:default,org.eclipse.oomph.setup.jdt@default:default,org.eclipse.oomph.setup.launching.edit@default:default,org.eclipse.oomph.setup.launching@default:default,org.eclipse.oomph.setup.maven.edit@default:default,org.eclipse.oomph.setup.maven@default:default,org.eclipse.oomph.setup.mylyn.edit@default:default,org.eclipse.oomph.setup.mylyn@default:default,org.eclipse.oomph.setup.p2.edit@default:default,org.eclipse.oomph.setup.p2@default:default,org.eclipse.oomph.setup.pde.edit@default:default,org.eclipse.oomph.setup.pde@default:default,org.eclipse.oomph.setup.projects.edit@default:default,org.eclipse.oomph.setup.projects@default:default,org.eclipse.oomph.setup.projectset.edit@default:default,org.eclipse.oomph.setup.projectset@default:default,org.eclipse.oomph.setup.sdk@default:default,org.eclipse.oomph.setup.sync@default:default,org.eclipse.oomph.setup.targlets.edit@default:default,org.eclipse.oomph.setup.targlets@default:default,org.eclipse.oomph.setup.ui.ide@default:default,org.eclipse.oomph.setup.ui.questionnaire@default:default,org.eclipse.oomph.setup.ui@default:default,org.eclipse.oomph.setup.workbench.edit@default:default,org.eclipse.oomph.setup.workbench@default:default,org.eclipse.oomph.setup.workingsets.edit@default:default,org.eclipse.oomph.setup.workingsets@default:default,org.eclipse.oomph.setup@default:default,org.eclipse.oomph.targlets.core@default:default,org.eclipse.oomph.targlets.doc@default:default,org.eclipse.oomph.targlets.edit@default:default,org.eclipse.oomph.targlets.editor@default:default,org.eclipse.oomph.targlets.ui@default:default,org.eclipse.oomph.targlets@default:default,org.eclipse.oomph.ui@default:default,org.eclipse.oomph.util.pde@default:default,org.eclipse.oomph.util@default:default,org.eclipse.oomph.version.digest@default:default,org.eclipse.oomph.version.ui@default:default,org.eclipse.oomph.version@default:default,org.eclipse.oomph.workingsets.edit@default:default,org.eclipse.oomph.workingsets.editor@default:default,org.eclipse.oomph.workingsets@default:default,org.eclipse.orbit.mongodb@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.papyrus.cdo.ui.doc@default:default,org.eclipse.papyrus.copypaste.ui.doc@default:default,org.eclipse.papyrus.dsml.validation.doc@default:default,org.eclipse.papyrus.dsml.validation@default:default,org.eclipse.papyrus.infra.doc@default:default,org.eclipse.papyrus.infra.gmfdiag.common.doc@default:default,org.eclipse.papyrus.infra.gmfdiag.css.doc@default:default,org.eclipse.papyrus.infra.nattable.doc@default:default,org.eclipse.papyrus.infra.newchild.doc@default:default,org.eclipse.papyrus.infra.services.controlmode.doc@default:default,org.eclipse.papyrus.infra.types.doc@default:default,org.eclipse.papyrus.infra.viewpoints.doc@default:default,org.eclipse.papyrus.layers.documentation@default:default,org.eclipse.papyrus.m2m.qvto@default:default,org.eclipse.papyrus.migration.rsa@default:default,org.eclipse.papyrus.req.reqif.doc@default:default,org.eclipse.papyrus.sysml14.diagram.blockdefinition@default:default,org.eclipse.papyrus.sysml14.diagram.common@default:default,org.eclipse.papyrus.sysml14.diagram.internalblock@default:default,org.eclipse.papyrus.sysml14.diagram.parametric@default:default,org.eclipse.papyrus.sysml14.diagram.requirement@default:default,org.eclipse.papyrus.sysml14.edit@default:default,org.eclipse.papyrus.sysml14.nattable.allocation@default:default,org.eclipse.papyrus.sysml14.nattable.common@default:default,org.eclipse.papyrus.sysml14.nattable.requirement@default:default,org.eclipse.papyrus.sysml14.nattable.ui@default:default,org.eclipse.papyrus.sysml14.service.types@default:default,org.eclipse.papyrus.sysml14.ui@default:default,org.eclipse.papyrus.sysml14.validation@default:default,org.eclipse.papyrus.sysml14.viewpoint@default:default,org.eclipse.papyrus.sysml14@default:default,org.eclipse.papyrus.uml.decoratormodel.doc@default:default,org.eclipse.papyrus.uml.diagram.common.doc@default:default,org.eclipse.papyrus.uml.diagram.profile.doc@default:default,org.eclipse.papyrus.uml.doc@default:default,org.eclipse.papyrus.uml.modelrepair.doc@default:default,org.eclipse.papyrus.uml.oclconstraintevaluation@default:default,org.eclipse.papyrus.uml.profile.assistants.doc@default:default,org.eclipse.papyrus.uml.search.ui.doc@default:default,org.eclipse.papyrus.uml.textedit.constraintwithessentialocl.xtext@default:default,org.eclipse.papyrus.views.properties.doc@default:default,org.eclipse.papyrus.views.references.doc@default:default,org.eclipse.pde.api.tools.annotations@default:default,org.eclipse.pde.api.tools.ui@default:default,org.eclipse.pde.api.tools@default:default,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.pde.ds.annotations@default:default,org.eclipse.pde.ds.core@default:default,org.eclipse.pde.ds.ui@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.pde.launching@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.pde.ua.core@default:default,org.eclipse.pde.ua.ui@default:default,org.eclipse.pde.ui.templates@default:default,org.eclipse.pde.ui@default:default,org.eclipse.pde@default:default,org.eclipse.platform.doc.isv@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.platform@default:default,org.eclipse.rcp@default:default,org.eclipse.recommenders.apidocs.rcp@default:default,org.eclipse.recommenders.apidocs@default:default,org.eclipse.recommenders.calls.rcp@default:default,org.eclipse.recommenders.calls@default:default,org.eclipse.recommenders.chain.rcp@default:default,org.eclipse.recommenders.completion.rcp@default:default,org.eclipse.recommenders.constructors.rcp@default:default,org.eclipse.recommenders.constructors@default:default,org.eclipse.recommenders.coordinates.rcp@default:default,org.eclipse.recommenders.coordinates@default:default,org.eclipse.recommenders.injection@default:default,org.eclipse.recommenders.jayes.io@default:default,org.eclipse.recommenders.jayes@default:default,org.eclipse.recommenders.jdt@default:default,org.eclipse.recommenders.models.rcp@default:default,org.eclipse.recommenders.models@default:default,org.eclipse.recommenders.mylyn.rcp@default:default,org.eclipse.recommenders.net@default:default,org.eclipse.recommenders.news.api@default:default,org.eclipse.recommenders.news.impl@default:default,org.eclipse.recommenders.news.rcp@default:default,org.eclipse.recommenders.news@default:default,org.eclipse.recommenders.overrides.rcp@default:default,org.eclipse.recommenders.overrides@default:default,org.eclipse.recommenders.rcp@default:default,org.eclipse.recommenders.snipmatch.rcp@default:default,org.eclipse.recommenders.snipmatch@default:default,org.eclipse.recommenders.subwords.rcp@default:default,org.eclipse.recommenders.types.rcp@default:default,org.eclipse.recommenders.utils.rcp@default:default,org.eclipse.recommenders.utils@default:default,org.eclipse.search@default:default,org.eclipse.sirius.common.acceleo.aql.ide@default:default,org.eclipse.sirius.common.acceleo.aql@default:default,org.eclipse.sirius.common.acceleo.mtl.ide@default:default,org.eclipse.sirius.common.acceleo.mtl@default:default,org.eclipse.sirius.common.interpreter@default:default,org.eclipse.sirius.common.ocl@default:default,org.eclipse.sirius.common.ui.ext@default:default,org.eclipse.sirius.common.ui@default:default,org.eclipse.sirius.common.xtext@default:default,org.eclipse.sirius.common@default:default,org.eclipse.sirius.diagram.formatdata@default:default,org.eclipse.sirius.diagram.layoutdata@default:default,org.eclipse.sirius.diagram.sequence.edit@default:default,org.eclipse.sirius.diagram.sequence.ui@default:default,org.eclipse.sirius.diagram.sequence@default:default,org.eclipse.sirius.diagram.ui.ext@default:default,org.eclipse.sirius.diagram.ui@default:default,org.eclipse.sirius.diagram@default:default,org.eclipse.sirius.doc@default:default,org.eclipse.sirius.ecore.extender@default:default,org.eclipse.sirius.editor.diagram@default:default,org.eclipse.sirius.editor.properties.ext.widgets.reference@default:default,org.eclipse.sirius.editor.properties@default:default,org.eclipse.sirius.editor.sequence@default:default,org.eclipse.sirius.editor.table@default:default,org.eclipse.sirius.editor.tree@default:default,org.eclipse.sirius.editor@default:default,org.eclipse.sirius.eef.adapters@default:default,org.eclipse.sirius.ext.base@default:default,org.eclipse.sirius.ext.draw2d@default:default,org.eclipse.sirius.ext.e3.ui@default:default,org.eclipse.sirius.ext.e3@default:default,org.eclipse.sirius.ext.emf.edit@default:default,org.eclipse.sirius.ext.emf.tx@default:default,org.eclipse.sirius.ext.emf.ui@default:default,org.eclipse.sirius.ext.emf@default:default,org.eclipse.sirius.ext.gef@default:default,org.eclipse.sirius.ext.gmf.notation@default:default,org.eclipse.sirius.ext.gmf.runtime@default:default,org.eclipse.sirius.ext.jface@default:default,org.eclipse.sirius.ext.swt@default:default,org.eclipse.sirius.interpreter@default:default,org.eclipse.sirius.properties.edit@default:default,org.eclipse.sirius.properties.ext.widgets.reference.edit@default:default,org.eclipse.sirius.properties.ext.widgets.reference@default:default,org.eclipse.sirius.properties@default:default,org.eclipse.sirius.samples.family@default:default,org.eclipse.sirius.synchronizer@default:default,org.eclipse.sirius.table.ui.ext@default:default,org.eclipse.sirius.table.ui@default:default,org.eclipse.sirius.table@default:default,org.eclipse.sirius.tree.ui.ext@default:default,org.eclipse.sirius.tree.ui@default:default,org.eclipse.sirius.tree@default:default,org.eclipse.sirius.ui.ext@default:default,org.eclipse.sirius.ui.properties.ext.widgets.reference@default:default,org.eclipse.sirius.ui.properties@default:default,org.eclipse.sirius.ui@default:default,org.eclipse.sirius@default:default,org.eclipse.swt.cocoa.macosx.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.swtbot.eclipse.finder@default:default,org.eclipse.swtbot.junit4_x@default:default,org.eclipse.swtbot.swt.finder@default:default,org.eclipse.team.core@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.team.cvs.ssh2@default:default,org.eclipse.team.cvs.ui@default:default,org.eclipse.team.svn.core@default:default,org.eclipse.team.svn.help@default:default,org.eclipse.team.svn.ui.startup@default:default,org.eclipse.team.svn.ui@default:default,org.eclipse.team.svn@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.browser@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro.quicklinks@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.monitoring@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.net@default:default,org.eclipse.ui.themes@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.uml2.codegen.ecore@default:default,org.eclipse.uml2.common.edit@default:default,org.eclipse.uml2.common@default:default,org.eclipse.uml2.types@default:default,org.eclipse.uml2.uml.edit@default:default,org.eclipse.uml2.uml.editor@default:default,org.eclipse.uml2.uml.profile.standard@default:default,org.eclipse.uml2.uml.resources@default:default,org.eclipse.uml2.uml.validation@default:default,org.eclipse.uml2.uml@default:default,org.eclipse.update.configurator@3:true,org.eclipse.upr.depl.papyrus@default:default,org.eclipse.upr.depl@default:default,org.eclipse.upr.soaml.papyrus@default:default,org.eclipse.upr.soaml@default:default,org.eclipse.upr.utp.papyrus@default:default,org.eclipse.upr.utp@default:default,org.eclipse.userstorage.ui@default:default,org.eclipse.userstorage@default:default,org.eclipse.wst.common.core@default:default,org.eclipse.wst.common.emf@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.wst.common.frameworks.ui@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.wst.common.ui@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.wst.sse.ui@default:default,org.eclipse.wst.validation.ui@default:default,org.eclipse.wst.validation@default:default,org.eclipse.wst.xml.core@default:default,org.eclipse.wst.xml.ui@default:default,org.eclipse.wst.xsd.core@default:default,org.eclipse.xpand@default:default,org.eclipse.xsd@default:default,org.eclipse.xtend.core@default:default,org.eclipse.xtend.doc@default:default,org.eclipse.xtend.examples@default:default,org.eclipse.xtend.ide.common@default:default,org.eclipse.xtend.ide@default:default,org.eclipse.xtend.lib.macro@default:default,org.eclipse.xtend.lib@default:default,org.eclipse.xtend.m2e@default:default,org.eclipse.xtend.standalone@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.xtend2.lib@default:default,org.eclipse.xtend@default:default,org.eclipse.xtext.activities@default:default,org.eclipse.xtext.builder.standalone@default:default,org.eclipse.xtext.builder@default:default,org.eclipse.xtext.common.types.edit@default:default,org.eclipse.xtext.common.types.shared.jdt38@default:false,org.eclipse.xtext.common.types.shared@default:default,org.eclipse.xtext.common.types.ui@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.xtext.doc@default:default,org.eclipse.xtext.ecore@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.xtext.ide@default:default,org.eclipse.xtext.idea.generator@default:default,org.eclipse.xtext.java@default:default,org.eclipse.xtext.junit4@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.xtext.m2e@default:default,org.eclipse.xtext.purexbase.ui@default:default,org.eclipse.xtext.purexbase@default:default,org.eclipse.xtext.smap@default:default,org.eclipse.xtext.ui.codetemplates.ui@default:default,org.eclipse.xtext.ui.codetemplates@default:default,org.eclipse.xtext.ui.ecore@default:default,org.eclipse.xtext.ui.shared@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.xtext.util@default:default,org.eclipse.xtext.xbase.ide@default:default,org.eclipse.xtext.xbase.junit@default:default,org.eclipse.xtext.xbase.lib@default:default,org.eclipse.xtext.xbase.ui@default:default,org.eclipse.xtext.xbase@default:default,org.eclipse.xtext.xtext.generator@default:default,org.eclipse.xtext.xtext.ui.examples@default:default,org.eclipse.xtext.xtext.ui.graph@default:default,org.eclipse.xtext.xtext.ui@default:default,org.eclipse.xtext.xtext.wizard@default:default,org.eclipse.xtext@default:default,org.eclipse.xwt@default:default,org.gradle.toolingapi@default:default,org.h2@default:default,org.hamcrest.core@default:default,org.hamcrest.integration@default:default,org.hamcrest.library@default:default,org.hamcrest.text@default:default,org.hamcrest@default:default,org.jsoup@default:default,org.junit@default:default,org.kohsuke.args4j@default:default,org.objectweb.asm.tree@default:default,org.objectweb.asm@default:default,org.polarion.eclipse.team.svn.connector.javahl19@default:default,org.polarion.eclipse.team.svn.connector@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.slf4j.impl.log4j12@default:false,org.sonatype.m2e.mavenarchiver@default:default,org.sonatype.tycho.m2e@default:default,org.tukaani.xz@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.papyrus.bundles.tests@default:default,org.eclipse.papyrus.codegen@default:default,org.eclipse.papyrus.customization.nattableconfiguration@default:default,org.eclipse.papyrus.customization.palette@default:default,org.eclipse.papyrus.customization.paletteconfiguration@default:default,org.eclipse.papyrus.customization.properties.generation@default:default,org.eclipse.papyrus.customization.properties.model.xwt@default:default,org.eclipse.papyrus.customization.properties@default:default,org.eclipse.papyrus.customization@default:default,org.eclipse.papyrus.def@default:default,org.eclipse.papyrus.dev.assistants.codegen@default:default,org.eclipse.papyrus.dev.java.utils@default:default,org.eclipse.papyrus.dev.project.management@default:default,org.eclipse.papyrus.dev.tests.framework.ui@default:default,org.eclipse.papyrus.dev.tests.framework@default:default,org.eclipse.papyrus.dev.types@default:default,org.eclipse.papyrus.dev.view.services.edit.request@default:default,org.eclipse.papyrus.developer.profile@default:default,org.eclipse.papyrus.eclipse.project.editors.tests@default:default,org.eclipse.papyrus.eclipse.project.editors@default:default,org.eclipse.papyrus.editor.integration.tests@default:default,org.eclipse.papyrus.editor.perspectiveconfiguration@default:default,org.eclipse.papyrus.editor@default:default,org.eclipse.papyrus.emf.facet.aggregate.doc@default:default,org.eclipse.papyrus.emf.facet.common.core@default:default,org.eclipse.papyrus.emf.facet.common.sdk.core@default:default,org.eclipse.papyrus.emf.facet.common.ui@default:default,org.eclipse.papyrus.emf.facet.custom.core@default:default,org.eclipse.papyrus.emf.facet.custom.doc@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel.edit@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel.editor.doc@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel.editor@default:default,org.eclipse.papyrus.emf.facet.custom.metamodel@default:default,org.eclipse.papyrus.emf.facet.custom.sdk.core@default:default,org.eclipse.papyrus.emf.facet.custom.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.custom.ui@default:default,org.eclipse.papyrus.emf.facet.doc@default:default,org.eclipse.papyrus.emf.facet.efacet.catalog@default:default,org.eclipse.papyrus.emf.facet.efacet.core@default:default,org.eclipse.papyrus.emf.facet.efacet.doc@default:default,org.eclipse.papyrus.emf.facet.efacet.edit@default:default,org.eclipse.papyrus.emf.facet.efacet.editor@default:default,org.eclipse.papyrus.emf.facet.efacet.metamodel.edit@default:default,org.eclipse.papyrus.emf.facet.efacet.metamodel@default:default,org.eclipse.papyrus.emf.facet.efacet.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.efacet.ui@default:default,org.eclipse.papyrus.emf.facet.efacet@default:default,org.eclipse.papyrus.emf.facet.query.java.core@default:default,org.eclipse.papyrus.emf.facet.query.java.metamodel@default:default,org.eclipse.papyrus.emf.facet.query.java.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.query.java@default:default,org.eclipse.papyrus.emf.facet.query.ocl.core@default:default,org.eclipse.papyrus.emf.facet.query.ocl.metamodel@default:default,org.eclipse.papyrus.emf.facet.query.ocl.sdk.ui@default:default,org.eclipse.papyrus.emf.facet.util.core@default:default,org.eclipse.papyrus.emf.facet.util.emf.catalog@default:default,org.eclipse.papyrus.emf.facet.util.emf.core@default:default,org.eclipse.papyrus.emf.facet.util.emf.doc@default:default,org.eclipse.papyrus.emf.facet.util.emf.ui@default:default,org.eclipse.papyrus.emf.facet.util.jface.ui@default:default,org.eclipse.papyrus.emf.facet.util.pde.core@default:default,org.eclipse.papyrus.emf.facet.util.swt@default:default,org.eclipse.papyrus.emf.facet.util.ui@default:default,org.eclipse.papyrus.emf.facet.widgets.celleditors.ecore@default:default,org.eclipse.papyrus.emf.facet.widgets.celleditors@default:default,org.eclipse.papyrus.emf.facet.widgets@default:default,org.eclipse.papyrus.extensionpoints.editors@default:default,org.eclipse.papyrus.gmf.editpartview@default:default,org.eclipse.papyrus.gmf.editpoliciesstates@default:default,org.eclipse.papyrus.gmf.figureview@default:default,org.eclipse.papyrus.gmfgenextension@default:default,org.eclipse.papyrus.infra.core.architecture.edit@default:default,org.eclipse.papyrus.infra.architecture.representation.edit@default:default,org.eclipse.papyrus.infra.architecture.representation@default:default,org.eclipse.papyrus.infra.architecture@default:default,org.eclipse.papyrus.infra.core.architecture.ui@default:default,org.eclipse.papyrus.infra.core.architecture@default:default,org.eclipse.papyrus.infra.constraints.edit@default:default,org.eclipse.papyrus.infra.constraints.editor@default:default,org.eclipse.papyrus.infra.constraints.ui@default:default,org.eclipse.papyrus.infra.constraints@default:default,org.eclipse.papyrus.infra.core.clipboard.tests@default:default,org.eclipse.papyrus.infra.core.log@default:default,org.eclipse.papyrus.infra.core.pluginexplorer@default:default,org.eclipse.papyrus.infra.core.sasheditor.di.tests@default:default,org.eclipse.papyrus.infra.core.sasheditor.di@default:default,org.eclipse.papyrus.infra.core.sasheditor.tests@default:default,org.eclipse.papyrus.infra.core.sasheditor@default:default,org.eclipse.papyrus.infra.core.sashwindows.di@default:default,org.eclipse.papyrus.infra.core.tests@default:default,org.eclipse.papyrus.infra.core@default:default,org.eclipse.papyrus.infra.discovery.ui.menu@default:default,org.eclipse.papyrus.infra.discovery.ui@default:default,org.eclipse.papyrus.infra.discovery@default:default,org.eclipse.papyrus.infra.editor.welcome.internationalization@default:default,org.eclipse.papyrus.infra.editor.welcome.nattable@default:default,org.eclipse.papyrus.infra.editor.welcome.tests@default:default,org.eclipse.papyrus.infra.editor.welcome@default:default,org.eclipse.papyrus.infra.emf.appearance@default:default,org.eclipse.papyrus.infra.emf.commandstack@default:default,org.eclipse.papyrus.infra.emf.diagram.common@default:default,org.eclipse.papyrus.infra.emf.gmf.tests@default:default,org.eclipse.papyrus.infra.emf.gmf@default:default,org.eclipse.papyrus.infra.emf.nattable@default:default,org.eclipse.papyrus.infra.emf.readonly.tests@default:default,org.eclipse.papyrus.infra.emf.readonly@default:default,org.eclipse.papyrus.infra.emf.tests@default:default,org.eclipse.papyrus.infra.emf.types.ui.properties@default:default,org.eclipse.papyrus.infra.emf.types.ui@default:default,org.eclipse.papyrus.infra.emf.types@default:default,org.eclipse.papyrus.infra.emf@default:default,org.eclipse.papyrus.infra.filters.edit@default:default,org.eclipse.papyrus.infra.filters.tests@default:default,org.eclipse.papyrus.infra.filters@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant.edit@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant.editor@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant.ui@default:default,org.eclipse.papyrus.infra.gmfdiag.assistant@default:default,org.eclipse.papyrus.infra.gmfdiag.canonical.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.canonical@default:default,org.eclipse.papyrus.infra.gmfdiag.commands.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.commands@default:default,org.eclipse.papyrus.infra.gmfdiag.common.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.common@default:default,org.eclipse.papyrus.infra.gmfdiag.controlmode@default:default,org.eclipse.papyrus.infra.gmfdiag.css.configuration@default:default,org.eclipse.papyrus.infra.gmfdiag.css.debug@default:default,org.eclipse.papyrus.infra.gmfdiag.css.model@default:default,org.eclipse.papyrus.infra.gmfdiag.css.properties@default:default,org.eclipse.papyrus.infra.gmfdiag.css.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.css.theme@default:default,org.eclipse.papyrus.infra.gmfdiag.css3.xtext.ui@default:default,org.eclipse.papyrus.infra.gmfdiag.css3.xtext@default:default,org.eclipse.papyrus.infra.gmfdiag.css@default:default,org.eclipse.papyrus.infra.gmfdiag.dnd@default:default,org.eclipse.papyrus.infra.gmfdiag.expansion.edit@default:default,org.eclipse.papyrus.infra.gmfdiag.expansion.editor@default:default,org.eclipse.papyrus.infra.gmfdiag.export@default:default,org.eclipse.papyrus.infra.gmfdiag.gef@default:default,org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter@default:default,org.eclipse.papyrus.infra.gmfdiag.hyperlink@default:default,org.eclipse.papyrus.infra.gmfdiag.menu.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.menu@default:default,org.eclipse.papyrus.infra.gmfdiag.modelexplorer@default:default,org.eclipse.papyrus.infra.gmfdiag.navigation@default:default,org.eclipse.papyrus.infra.gmfdiag.outline@default:default,org.eclipse.papyrus.infra.gmfdiag.preferences@default:default,org.eclipse.papyrus.infra.gmfdiag.properties@default:default,org.eclipse.papyrus.infra.gmfdiag.viewersearcher@default:default,org.eclipse.papyrus.infra.gmfdiag.welcome.tests@default:default,org.eclipse.papyrus.infra.gmfdiag.welcome@default:default,org.eclipse.papyrus.infra.gmfdiag.widgets@default:default,org.eclipse.papyrus.infra.hyperlink@default:default,org.eclipse.papyrus.infra.internationalization.common@default:default,org.eclipse.papyrus.infra.internationalization.controlmode@default:default,org.eclipse.papyrus.infra.internationalization.edit@default:default,org.eclipse.papyrus.infra.internationalization.readonly@default:default,org.eclipse.papyrus.infra.internationalization.tests@default:default,org.eclipse.papyrus.infra.internationalization.ui@default:default,org.eclipse.papyrus.infra.internationalization.utils@default:default,org.eclipse.papyrus.infra.internationalization@default:default,org.eclipse.papyrus.infra.nattable.common.tests@default:default,org.eclipse.papyrus.infra.nattable.common@default:default,org.eclipse.papyrus.infra.nattable.controlmode@default:default,org.eclipse.papyrus.infra.nattable.gmfdiag@default:default,org.eclipse.papyrus.infra.nattable.model.edit@default:default,org.eclipse.papyrus.infra.nattable.model.editor.tests@default:default,org.eclipse.papyrus.infra.nattable.model.editor@default:default,org.eclipse.papyrus.infra.nattable.model.tests@default:default,org.eclipse.papyrus.infra.nattable.model@default:default,org.eclipse.papyrus.infra.nattable.modelexplorer@default:default,org.eclipse.papyrus.infra.nattable.properties@default:default,org.eclipse.papyrus.infra.nattable.tests@default:default,org.eclipse.papyrus.infra.nattable.views.config@default:default,org.eclipse.papyrus.infra.nattable.views.editor@default:default,org.eclipse.papyrus.infra.nattable.views.tests@default:default,org.eclipse.papyrus.infra.nattable@default:default,org.eclipse.papyrus.infra.newchild.edit@default:default,org.eclipse.papyrus.infra.newchild.editor@default:default,org.eclipse.papyrus.infra.newchild.tests@default:default,org.eclipse.papyrus.infra.newchild.ui@default:default,org.eclipse.papyrus.infra.newchild@default:default,org.eclipse.papyrus.infra.onefile.ui@default:default,org.eclipse.papyrus.infra.onefile@default:default,org.eclipse.papyrus.infra.properties.edit@default:default,org.eclipse.papyrus.infra.properties.editor@default:default,org.eclipse.papyrus.infra.properties.ui.tests@default:default,org.eclipse.papyrus.infra.properties.ui@default:default,org.eclipse.papyrus.infra.properties@default:default,org.eclipse.papyrus.infra.psf@default:default,org.eclipse.papyrus.infra.services.controlmode.history@default:default,org.eclipse.papyrus.infra.services.controlmode.tests@default:default,org.eclipse.papyrus.infra.services.controlmode@default:default,org.eclipse.papyrus.infra.services.decoration@default:default,org.eclipse.papyrus.infra.services.edit.tests@default:default,org.eclipse.papyrus.infra.services.edit.ui.tests@default:default,org.eclipse.papyrus.infra.services.edit.ui@default:default,org.eclipse.papyrus.infra.services.edit@default:default,org.eclipse.papyrus.infra.services.labelprovider.tests@default:default,org.eclipse.papyrus.infra.services.labelprovider@default:default,org.eclipse.papyrus.infra.services.localizer@default:default,org.eclipse.papyrus.infra.services.markerlistener@default:default,org.eclipse.papyrus.infra.services.navigation@default:default,org.eclipse.papyrus.infra.services.openelement@default:default,org.eclipse.papyrus.infra.services.resourceloading.tests@default:default,org.eclipse.papyrus.infra.services.resourceloading.ui@default:default,org.eclipse.papyrus.infra.services.resourceloading@default:default,org.eclipse.papyrus.infra.services.semantic.tests@default:default,org.eclipse.papyrus.infra.services.semantic@default:default,org.eclipse.papyrus.infra.services.validation@default:default,org.eclipse.papyrus.infra.services.viewersearch@default:default,org.eclipse.papyrus.infra.services.viewlabelprovider@default:default,org.eclipse.papyrus.infra.sync@default:default,org.eclipse.papyrus.infra.tools.tests@default:default,org.eclipse.papyrus.infra.tools@default:default,org.eclipse.papyrus.infra.types.core@default:default,org.eclipse.papyrus.infra.types.edit@default:default,org.eclipse.papyrus.infra.types.editor@default:default,org.eclipse.papyrus.infra.types.rulebased@default:default,org.eclipse.papyrus.infra.types.tests@default:default,org.eclipse.papyrus.infra.types.ui.tests@default:default,org.eclipse.papyrus.infra.types.ui@default:default,org.eclipse.papyrus.infra.types@default:default,org.eclipse.papyrus.infra.ui.emf.tests@default:default,org.eclipse.papyrus.infra.ui.emf@default:default,org.eclipse.papyrus.infra.ui.resources@default:default,org.eclipse.papyrus.infra.ui.tests@default:default,org.eclipse.papyrus.infra.ui@default:default,org.eclipse.papyrus.infra.viewpoints.configuration.tests@default:default,org.eclipse.papyrus.infra.viewpoints.policy.edit@default:default,org.eclipse.papyrus.infra.viewpoints.policy.tests@default:default,org.eclipse.papyrus.infra.viewpoints.policy@default:default,org.eclipse.papyrus.infra.widgets.toolbox@default:default,org.eclipse.papyrus.infra.widgets@default:default,org.eclipse.papyrus.junit.framework@default:default,org.eclipse.papyrus.junit.utils@default:default,org.eclipse.papyrus.mwe2.utils@default:default,org.eclipse.papyrus.releng.dev.release@default:default,org.eclipse.papyrus.releng.main.release@default:default,org.eclipse.papyrus.sdk@default:default,org.eclipse.papyrus.search.tests@default:default,org.eclipse.papyrus.sysml.architecture@default:default,org.eclipse.papyrus.sysml.diagram.blockdefinition.tests@default:default,org.eclipse.papyrus.sysml.diagram.blockdefinition@default:default,org.eclipse.papyrus.sysml.diagram.common@default:default,org.eclipse.papyrus.sysml.diagram.css@default:default,org.eclipse.papyrus.sysml.diagram.internalblock.tests@default:default,org.eclipse.papyrus.sysml.diagram.internalblock@default:default,org.eclipse.papyrus.sysml.diagram.parametric.tests@default:default,org.eclipse.papyrus.sysml.diagram.parametric@default:default,org.eclipse.papyrus.sysml.diagram.requirement.tests@default:default,org.eclipse.papyrus.sysml.diagram.requirement@default:default,org.eclipse.papyrus.sysml.diagram.ui@default:default,org.eclipse.papyrus.sysml.edit@default:default,org.eclipse.papyrus.sysml.modelexplorer.tests@default:default,org.eclipse.papyrus.sysml.modelexplorer@default:default,org.eclipse.papyrus.sysml.nattable.allocation.config@default:default,org.eclipse.papyrus.sysml.nattable.allocation.tests@default:default,org.eclipse.papyrus.sysml.nattable.allocation@default:default,org.eclipse.papyrus.sysml.nattable.menu@default:default,org.eclipse.papyrus.sysml.nattable.requirement.config@default:default,org.eclipse.papyrus.sysml.nattable.requirement.tests@default:default,org.eclipse.papyrus.sysml.nattable.requirement@default:default,org.eclipse.papyrus.sysml.nattable@default:default,org.eclipse.papyrus.sysml.properties@default:default,org.eclipse.papyrus.sysml.service.types.tests@default:default,org.eclipse.papyrus.sysml.service.types@default:default,org.eclipse.papyrus.sysml.tests@default:default,org.eclipse.papyrus.sysml@default:default,org.eclipse.papyrus.team.svn@default:default,org.eclipse.papyrus.tests.diagramassistants@default:default,org.eclipse.papyrus.tests.framework.annotations@default:default,org.eclipse.papyrus.tests.framework.edit@default:default,org.eclipse.papyrus.tests.framework.editor@default:default,org.eclipse.papyrus.tests.framework@default:default,org.eclipse.papyrus.tests@default:default,org.eclipse.papyrus.uml.alf.backend.tests@default:default,org.eclipse.papyrus.uml.alf.common.ui@default:default,org.eclipse.papyrus.uml.alf.common@default:default,org.eclipse.papyrus.uml.alf.libraries@default:default,org.eclipse.papyrus.uml.alf.tests@default:default,org.eclipse.papyrus.uml.alf.to.fuml@default:default,org.eclipse.papyrus.uml.alf.ui@default:default,org.eclipse.papyrus.uml.alf@default:default,org.eclipse.papyrus.uml.appearance@default:default,org.eclipse.papyrus.uml.architecture@default:default,org.eclipse.papyrus.uml.commands@default:default,org.eclipse.papyrus.uml.controlmode.profile@default:default,org.eclipse.papyrus.uml.decoratormodel.controlmode.tests@default:default,org.eclipse.papyrus.uml.decoratormodel.controlmode@default:default,org.eclipse.papyrus.uml.decoratormodel.properties@default:default,org.eclipse.papyrus.uml.decoratormodel.tests@default:default,org.eclipse.papyrus.uml.decoratormodel.ui@default:default,org.eclipse.papyrus.uml.decoratormodel@default:default,org.eclipse.papyrus.uml.developer.mde@default:default,org.eclipse.papyrus.uml.diagram.activity.tests@default:default,org.eclipse.papyrus.uml.diagram.activity@default:default,org.eclipse.papyrus.uml.diagram.clazz.tests@default:default,org.eclipse.papyrus.uml.diagram.clazz@default:default,org.eclipse.papyrus.uml.diagram.common.groups@default:default,org.eclipse.papyrus.uml.diagram.common.palette.customaction@default:default,org.eclipse.papyrus.uml.diagram.common.tests@default:default,org.eclipse.papyrus.uml.diagram.common@default:default,org.eclipse.papyrus.uml.diagram.communication.tests@default:default,org.eclipse.papyrus.uml.diagram.communication@default:default,org.eclipse.papyrus.uml.diagram.component.tests@default:default,org.eclipse.papyrus.uml.diagram.component@default:default,org.eclipse.papyrus.uml.diagram.composite.tests@default:default,org.eclipse.papyrus.uml.diagram.composite@default:default,org.eclipse.papyrus.uml.diagram.css.palette@default:default,org.eclipse.papyrus.uml.diagram.css@default:default,org.eclipse.papyrus.uml.diagram.deployment.tests@default:default,org.eclipse.papyrus.uml.diagram.deployment@default:default,org.eclipse.papyrus.uml.diagram.dnd.tests@default:default,org.eclipse.papyrus.uml.diagram.dnd@default:default,org.eclipse.papyrus.uml.diagram.icons@default:default,org.eclipse.papyrus.uml.diagram.interactionoverview.tests@default:default,org.eclipse.papyrus.uml.diagram.interactionoverview@default:default,org.eclipse.papyrus.uml.diagram.linklf@default:default,org.eclipse.papyrus.uml.diagram.menu@default:default,org.eclipse.papyrus.uml.diagram.modelexplorer@default:default,org.eclipse.papyrus.uml.diagram.navigation@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration.editor@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration.tests@default:default,org.eclipse.papyrus.uml.diagram.paletteconfiguration@default:default,org.eclipse.papyrus.uml.diagram.profile.tests@default:default,org.eclipse.papyrus.uml.diagram.profile@default:default,org.eclipse.papyrus.uml.diagram.sequence.tests@default:default,org.eclipse.papyrus.uml.diagram.sequence@default:default,org.eclipse.papyrus.uml.diagram.statemachine.tests@default:default,org.eclipse.papyrus.uml.diagram.statemachine@default:default,org.eclipse.papyrus.uml.diagram.stereotype.edition@default:default,org.eclipse.papyrus.uml.diagram.stereotypeproperty.tests@default:default,org.eclipse.papyrus.uml.diagram.symbols.properties@default:default,org.eclipse.papyrus.uml.diagram.symbols@default:default,org.eclipse.papyrus.uml.diagram.tests@default:default,org.eclipse.papyrus.uml.diagram.timing.tests@default:default,org.eclipse.papyrus.uml.diagram.timing@default:default,org.eclipse.papyrus.uml.diagram.usecase.tests@default:default,org.eclipse.papyrus.uml.diagram.usecase@default:default,org.eclipse.papyrus.uml.diagram.wizards.tests@default:default,org.eclipse.papyrus.uml.diagram.wizards@default:default,org.eclipse.papyrus.uml.documentation.profile@default:default,org.eclipse.papyrus.uml.dynamic.profile.tests@default:default,org.eclipse.papyrus.uml.extensionpoints@default:default,org.eclipse.papyrus.uml.filters.edit@default:default,org.eclipse.papyrus.uml.filters.tests@default:default,org.eclipse.papyrus.uml.filters@default:default,org.eclipse.papyrus.uml.icons@default:default,org.eclipse.papyrus.uml.import@default:default,org.eclipse.papyrus.uml.internationalization.controlmode.tests@default:default,org.eclipse.papyrus.uml.internationalization.edit@default:default,org.eclipse.papyrus.uml.internationalization.tests@default:default,org.eclipse.papyrus.uml.internationalization.utils@default:default,org.eclipse.papyrus.uml.internationalization@default:default,org.eclipse.papyrus.uml.modelexplorer.tests@default:default,org.eclipse.papyrus.uml.modelexplorer.widgets@default:default,org.eclipse.papyrus.uml.modelexplorer@default:default,org.eclipse.papyrus.uml.modelrepair.tests@default:default,org.eclipse.papyrus.uml.modelrepair@default:default,org.eclipse.papyrus.uml.nattable.clazz.config.tests@default:default,org.eclipse.papyrus.uml.nattable.clazz.config@default:default,org.eclipse.papyrus.uml.nattable.generic.config@default:default,org.eclipse.papyrus.uml.nattable.generic.tests@default:default,org.eclipse.papyrus.uml.nattable.generic@default:default,org.eclipse.papyrus.uml.nattable.menu@default:default,org.eclipse.papyrus.uml.nattable.richtext@default:default,org.eclipse.papyrus.uml.nattable.stereotype.display.tests@default:default,org.eclipse.papyrus.uml.nattable.stereotype.display@default:default,org.eclipse.papyrus.uml.nattable.tests@default:default,org.eclipse.papyrus.uml.nattable.xtext.integration@default:default,org.eclipse.papyrus.uml.nattable.xtext.valuespecification@default:default,org.eclipse.papyrus.uml.nattable@default:default,org.eclipse.papyrus.uml.navigation@default:default,org.eclipse.papyrus.uml.perspective@default:default,org.eclipse.papyrus.uml.profile.assistants.generator.tests@default:default,org.eclipse.papyrus.uml.profile.assistants.generator.ui@default:default,org.eclipse.papyrus.uml.profile.assistants.generator@default:default,org.eclipse.papyrus.uml.profile.drafter.documentation@default:default,org.eclipse.papyrus.uml.profile.drafter.tests@default:default,org.eclipse.papyrus.uml.profile.drafter@default:default,org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui@default:default,org.eclipse.papyrus.uml.profile.newchildmenu.generator@default:default,org.eclipse.papyrus.uml.profile.tests@default:default,org.eclipse.papyrus.uml.profile.types.generator.tests@default:default,org.eclipse.papyrus.uml.profile.types.generator.ui@default:default,org.eclipse.papyrus.uml.profile.types.generator@default:default,org.eclipse.papyrus.uml.profile@default:default,org.eclipse.papyrus.uml.properties.xtext@default:default,org.eclipse.papyrus.uml.properties@default:default,org.eclipse.papyrus.uml.resourceloading.profile@default:default,org.eclipse.papyrus.uml.search.ui@default:default,org.eclipse.papyrus.uml.service.types.tests@default:default,org.eclipse.papyrus.uml.service.types.ui.tests@default:default,org.eclipse.papyrus.uml.service.types.ui@default:default,org.eclipse.papyrus.uml.service.types@default:default,org.eclipse.papyrus.uml.service.validation@default:default,org.eclipse.papyrus.uml.services.decoration@default:default,org.eclipse.papyrus.uml.templaterepository@default:default,org.eclipse.papyrus.uml.textedit.collaborationuse.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.collaborationuse.xtext@default:default,org.eclipse.papyrus.uml.textedit.common.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.common.xtext@default:default,org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext@default:default,org.eclipse.papyrus.uml.textedit.javaconstraint@default:default,org.eclipse.papyrus.uml.textedit.message.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.message.xtext@default:default,org.eclipse.papyrus.uml.textedit.parameter.tests@default:default,org.eclipse.papyrus.uml.textedit.parameter.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.parameter.xtext@default:default,org.eclipse.papyrus.uml.textedit.port.tests@default:default,org.eclipse.papyrus.uml.textedit.port.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.port.xtext@default:default,org.eclipse.papyrus.uml.textedit.property.tests@default:default,org.eclipse.papyrus.uml.textedit.property.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.property.xtext@default:default,org.eclipse.papyrus.uml.textedit.state.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.state.xtext@default:default,org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext@default:default,org.eclipse.papyrus.uml.textedit.tests@default:default,org.eclipse.papyrus.uml.textedit.transition.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.transition.xtext@default:default,org.eclipse.papyrus.uml.textedit.valuespecification.tests@default:default,org.eclipse.papyrus.uml.textedit.valuespecification.xtext.ui@default:default,org.eclipse.papyrus.uml.textedit.valuespecification.xtext.utils@default:default,org.eclipse.papyrus.uml.textedit.valuespecification.xtext@default:default,org.eclipse.papyrus.uml.tools.tests@default:default,org.eclipse.papyrus.uml.tools.utils.tests@default:default,org.eclipse.papyrus.uml.tools.utils@default:default,org.eclipse.papyrus.uml.tools@default:default,org.eclipse.papyrus.uml.types.core@default:default,org.eclipse.papyrus.uml.types.ui.properties@default:default,org.eclipse.papyrus.uml.ui@default:default,org.eclipse.papyrus.uml.validation.tests.genvalidation@default:default,org.eclipse.papyrus.uml.validation.tests.staticprofile@default:default,org.eclipse.papyrus.uml.validation.tests@default:default,org.eclipse.papyrus.uml.xtext.integration.core@default:default,org.eclipse.papyrus.uml.xtext.integration.ui@default:default,org.eclipse.papyrus.uml.xtext.integration.validation@default:default,org.eclipse.papyrus.views.documentation@default:default,org.eclipse.papyrus.views.modelexplorer.newchild@default:default,org.eclipse.papyrus.views.modelexplorer.resourceloading@default:default,org.eclipse.papyrus.views.modelexplorer.tests@default:default,org.eclipse.papyrus.views.modelexplorer.widgets@default:default,org.eclipse.papyrus.views.modelexplorer@default:default,org.eclipse.papyrus.views.properties@default:default,org.eclipse.papyrus.views.references@default:default,org.eclipse.papyrus.views.search@default:default,org.eclipse.papyrus.views.validation@default:default"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <booleanAttribute key="tracing" value="false"/>
 <booleanAttribute key="useCustomFeatures" value="false"/>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/META-INF/MANIFEST.MF
index 25231c42f08..0241921661e 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.stereotyped.elements.tests/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui;bundle-version="[3.109.0,4.0.0)",
+Require-Bundle: org.eclipse.ui;bundle-version="[3.108.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
  org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
  org.junit;bundle-version="[4.12.0,5.0.0)",
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/org.eclipse.papyrus.uml.service.types.tests.launch b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/org.eclipse.papyrus.uml.service.types.tests.launch
index 2d1b8cf901f..e958d319753 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/org.eclipse.papyrus.uml.service.types.tests.launch
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/org.eclipse.papyrus.uml.service.types.tests.launch
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
 <booleanAttribute key="append.args" value="true"/>
-<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
 <booleanAttribute key="askclear" value="false"/>
 <booleanAttribute key="automaticAdd" value="true"/>
 <booleanAttribute key="automaticValidate" value="false"/>
@@ -40,5 +39,5 @@
 <booleanAttribute key="useCustomFeatures" value="false"/>
 <booleanAttribute key="useDefaultConfig" value="true"/>
 <booleanAttribute key="useDefaultConfigArea" value="false"/>
-<booleanAttribute key="useProduct" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
 </launchConfiguration>
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/creation/ConnectorReadOnlyTestBug465899.java b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/creation/ConnectorReadOnlyTestBug465899.java
index 12acfd56b93..3ba9ee450f8 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/creation/ConnectorReadOnlyTestBug465899.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/creation/ConnectorReadOnlyTestBug465899.java
@@ -18,7 +18,10 @@ import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
 
 import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.services.edit.context.TypeContext;
 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
 import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
@@ -53,67 +56,92 @@ public class ConnectorReadOnlyTestBug465899 extends AbstractPapyrusTest {
 
 	@Test
 	public void createConnectorSourceReadOnly() throws Exception {
-		Class composite = (Class) model.getModel().getOwnedType("Composite");
-		Port port = Iterables.filter(composite.getAllAttributes(), Port.class).iterator().next();
-		Property part = composite.getOwnedAttribute("part", null);
-
-		IElementEditService service = ElementEditServiceUtils.getCommandProvider(UMLElementTypes.PROPERTY_PART);
-		ICommand command = service.getEditCommand(new CreateRelationshipRequest(composite, port, part, UMLElementTypes.CONNECTOR));
-
-		assertThat("No command provided", command, notNullValue());
-		assertThat("Command not executable", command.canExecute(), is(true));
+		try {
+			Class composite = (Class) model.getModel().getOwnedType("Composite");
+			Port port = Iterables.filter(composite.getAllAttributes(), Port.class).iterator().next();
+			Property part = composite.getOwnedAttribute("part", null);
+	
+			IClientContext context = TypeContext.getContext(model.getResourceSet());
+			IElementEditService service = ElementEditServiceUtils.getCommandProvider(UMLElementTypes.PROPERTY_PART, context);
+			ICommand command = service.getEditCommand(new CreateRelationshipRequest(composite, port, part, UMLElementTypes.CONNECTOR));
+	
+			assertThat("No command provided", command, notNullValue());
+			assertThat("Command not executable", command.canExecute(), is(true));
+		} catch (ServiceException e) {
+			System.out.println(e);
+		}
 	}
 
 	@Test
 	public void createConnectorTargetReadOnly() throws Exception {
-		Class composite = (Class) model.getModel().getOwnedType("Composite");
-		Port port = Iterables.filter(composite.getAllAttributes(), Port.class).iterator().next();
-		Property part = composite.getOwnedAttribute("part", null);
-
-		IElementEditService service = ElementEditServiceUtils.getCommandProvider(UMLElementTypes.PORT);
-		ICommand command = service.getEditCommand(new CreateRelationshipRequest(composite, part, port, UMLElementTypes.CONNECTOR));
-
-		assertThat("No command provided", command, notNullValue());
-		assertThat("Command not executable", command.canExecute(), is(true));
+		try {
+			Class composite = (Class) model.getModel().getOwnedType("Composite");
+			Port port = Iterables.filter(composite.getAllAttributes(), Port.class).iterator().next();
+			Property part = composite.getOwnedAttribute("part", null);
+	
+			IClientContext context = TypeContext.getContext(model.getResourceSet());
+			IElementEditService service = ElementEditServiceUtils.getCommandProvider(UMLElementTypes.PORT, context);
+			ICommand command = service.getEditCommand(new CreateRelationshipRequest(composite, part, port, UMLElementTypes.CONNECTOR));
+	
+			assertThat("No command provided", command, notNullValue());
+			assertThat("Command not executable", command.canExecute(), is(true));
+		} catch (ServiceException e) {
+			System.out.println(e);
+		}
 	}
 
 	// Association between classes, the classes owns both member ends, so they are altered.
 	@Test
 	public void createAssociationWritable() throws Exception {
-		Class class1 = (Class) model.getModel().getOwnedMember("Class1");
-		Class class2 = (Class) model.getModel().getOwnedMember("Class2");
-
-		IElementEditService service = ElementEditServiceUtils.getCommandProvider(UMLElementTypes.CLASS);
-		ICommand command = service.getEditCommand(new CreateRelationshipRequest(model.getModel(), class1, class2, UMLElementTypes.ASSOCIATION));
-
-		assertThat("No command provided", command, notNullValue());
-		assertThat("Command is executable", command.canExecute(), is(false));
+		try {
+			Class class1 = (Class) model.getModel().getOwnedMember("Class1");
+			Class class2 = (Class) model.getModel().getOwnedMember("Class2");
+	
+			IClientContext context = TypeContext.getContext(model.getResourceSet());
+			IElementEditService service = ElementEditServiceUtils.getCommandProvider(UMLElementTypes.CLASS, context);
+			ICommand command = service.getEditCommand(new CreateRelationshipRequest(model.getModel(), class1, class2, UMLElementTypes.ASSOCIATION));
+	
+			assertThat("No command provided", command, notNullValue());
+			assertThat("Command is executable", command.canExecute(), is(false));
+		} catch (ServiceException e) {
+			System.out.println(e);
+		}
 	}
 
 	// Association between classes, the classes owns both member ends, so they are altered.
 	@Test
 	public void createAssociationReadOnly() throws Exception {
-		Class class1 = (Class) model.getModel().getImportedMember("LibraryClass1");
-		Class class2 = (Class) model.getModel().getImportedMember("LibraryClass2");
-
-		IElementEditService service = ElementEditServiceUtils.getCommandProvider(UMLElementTypes.CLASS);
-		ICommand command = service.getEditCommand(new CreateRelationshipRequest(model.getModel(), class1, class2, UMLElementTypes.ASSOCIATION));
-
-		assertThat("No command provided", command, notNullValue());
-		assertThat("Command is executable", command.canExecute(), is(false));
+		try {
+			Class class1 = (Class) model.getModel().getImportedMember("LibraryClass1");
+			Class class2 = (Class) model.getModel().getImportedMember("LibraryClass2");
+	
+			IClientContext context = TypeContext.getContext(model.getResourceSet());
+			IElementEditService service = ElementEditServiceUtils.getCommandProvider(UMLElementTypes.CLASS, context);
+			ICommand command = service.getEditCommand(new CreateRelationshipRequest(model.getModel(), class1, class2, UMLElementTypes.ASSOCIATION));
+	
+			assertThat("No command provided", command, notNullValue());
+			assertThat("Command is executable", command.canExecute(), is(false));
+		} catch (ServiceException e) {
+			System.out.println(e);
+		}
 	}
 
 	// Association between usecase and actor owns both member ends, so does not alter the
 	// end types.
 	@Test
 	public void createAssociationReadOnly_usecase() throws Exception {
-		UseCase usecase = (UseCase) model.getModel().getImportedMember("UseCase1");
-		Actor actor = (Actor) model.getModel().getImportedMember("Actor1");
-
-		IElementEditService service = ElementEditServiceUtils.getCommandProvider(UMLElementTypes.USE_CASE);
-		ICommand command = service.getEditCommand(new CreateRelationshipRequest(model.getModel(), usecase, actor, UMLElementTypes.ASSOCIATION));
-
-		assertThat("No command provided", command, notNullValue());
-		assertThat("Command is not executable", command.canExecute(), is(true));
+		try {
+			UseCase usecase = (UseCase) model.getModel().getImportedMember("UseCase1");
+			Actor actor = (Actor) model.getModel().getImportedMember("Actor1");
+	
+			IClientContext context = TypeContext.getContext(model.getResourceSet());
+			IElementEditService service = ElementEditServiceUtils.getCommandProvider(UMLElementTypes.USE_CASE, context);
+			ICommand command = service.getEditCommand(new CreateRelationshipRequest(model.getModel(), usecase, actor, UMLElementTypes.ASSOCIATION));
+	
+			assertThat("No command provided", command, notNullValue());
+			assertThat("Command is not executable", command.canExecute(), is(true));
+		} catch (ServiceException e) {
+			System.out.println(e);
+		}
 	}
 }
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/creation/CreatePureUMLElementTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/creation/CreatePureUMLElementTest.java
index c444aff7af1..9f698c6cf67 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/creation/CreatePureUMLElementTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/creation/CreatePureUMLElementTest.java
@@ -29,7 +29,6 @@ import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.edit.command.CommandParameter;
 import org.eclipse.emf.edit.command.CreateChildCommand;
 import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
@@ -39,10 +38,23 @@ import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
 import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
+import org.eclipse.papyrus.infra.core.editor.ModelSetServiceFactory;
+import org.eclipse.papyrus.infra.core.resource.EditingDomainServiceFactory;
+import org.eclipse.papyrus.infra.core.resource.ModelMultiException;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.ModelsReader;
+import org.eclipse.papyrus.infra.core.services.ExtensionServicesRegistry;
+import org.eclipse.papyrus.infra.core.services.ServiceDescriptor;
+import org.eclipse.papyrus.infra.core.services.ServiceDescriptor.ServiceTypeKind;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServiceStartKind;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
 import org.eclipse.papyrus.infra.types.core.registries.ElementTypeSetConfigurationRegistry;
 import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.papyrus.junit.utils.ModelUtils;
 import org.eclipse.papyrus.junit.utils.PapyrusProjectUtils;
 import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
 import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
@@ -81,6 +93,8 @@ public class CreatePureUMLElementTest extends AbstractPapyrusTest {
 	private static Activity testActivityWithNode;
 
 	private static Resource resource;
+	
+	private static ModelSet modelSet;
 
 	private static TransactionalEditingDomain domain;
 
@@ -92,7 +106,10 @@ public class CreatePureUMLElementTest extends AbstractPapyrusTest {
 		// create UML resource
 		// import test model
 		try {
-			copyPapyrusModel = PapyrusProjectUtils.copyIFile("/resource/TestPureUMLModel.uml", Platform.getBundle("org.eclipse.papyrus.uml.service.types.tests"), createProject, "TestPureUMLModel.uml");
+			copyPapyrusModel = PapyrusProjectUtils.copyPapyrusModel(
+					createProject, 
+					Platform.getBundle("org.eclipse.papyrus.uml.service.types.tests"),
+					"/resource/", "TestPureUMLModel");
 		} catch (CoreException e) {
 			fail(e.getMessage());
 		} catch (IOException e) {
@@ -100,14 +117,16 @@ public class CreatePureUMLElementTest extends AbstractPapyrusTest {
 		}
 
 		// open model as UML resource
-		domain = houseKeeper.createSimpleEditingDomain();
-		ResourceSet set = domain.getResourceSet();
-		resource = set.createResource(URI.createPlatformResourceURI(createProject.getName() + '/' + copyPapyrusModel.getName(), true));
+		final URI clientModelDiURI = URI.createPlatformResourceURI(createProject.getName() + '/' + copyPapyrusModel.getName(), true);
 		try {
-			resource.load(Collections.emptyMap());
-		} catch (IOException e) {
+			modelSet = ModelUtils.loadModelSet(clientModelDiURI, true);
+		} catch (ModelMultiException e) {
 			fail(e.getMessage());
 		}
+		domain = ModelUtils.getEditingDomain(modelSet);
+
+		final URI clientModelUmlURI = URI.createPlatformResourceURI(createProject.getName() + '/' + "TestPureUMLModel.uml", true);
+		resource = modelSet.getResource(clientModelUmlURI, true);
 
 		rootModel = (Model) resource.getContents().get(0);
 		assertNotNull("Model should not be null", rootModel);
@@ -127,8 +146,72 @@ public class CreatePureUMLElementTest extends AbstractPapyrusTest {
 				Assert.assertNotNull("element type should not be null", UMLElementTypes.CLASS);
 			}
 		});
+	}
+
+	/**
+	 * Create Models set from selected file.
+	 *
+	 * @return the model set
+	 */
+	private ModelSet initialiseModelSet(URI modelURI) {
+		ServicesRegistry service = null;
+
+		try {
+			service = new ExtensionServicesRegistry();
+		} catch (ServiceException e) {
+			fail(e.getMessage());
+		}
+
+		// Override service factory for Model Set
+		ServiceDescriptor descriptor = new ServiceDescriptor(ModelSet.class, ModelSetServiceFactory.class.getName(), ServiceStartKind.STARTUP, 10);
+		descriptor.setServiceTypeKind(ServiceTypeKind.serviceFactory);
+		service.add(descriptor);
+
+		// Override factory for editing domain
+		descriptor = new ServiceDescriptor(TransactionalEditingDomain.class, EditingDomainServiceFactory.class.getName(), ServiceStartKind.STARTUP, 10, Collections.singletonList(ModelSet.class.getName()));
+		descriptor.setServiceTypeKind(ServiceTypeKind.serviceFactory);
+		service.add(descriptor);
+
+		try {
+			service.startServicesByClassKeys(
+					ModelSet.class,
+					TransactionalEditingDomain.class);
+		} catch (ServiceException e) {
+			fail(e.getMessage());
+		}
+
+		ModelSet modelSet = null;
+		try {
+			modelSet = ServiceUtils.getInstance().getModelSet(service);
+		} catch (ServiceException e) {
+			// Ignore service exception
+		}
+
+		// Instantiate a Model set
+		if (modelSet == null) {
+			modelSet = new ModelSet();
+			try {
+				ModelSetServiceFactory.setServiceRegistry(modelSet, service);
+			} catch (ServiceException e) {
+				// Ignore service exception
+			}
+		}
+
+
+
+		// Read all Model from selected file
+		ModelsReader modelsReader = new ModelsReader();
+		modelsReader.readModel(modelSet);
+		try {
+			modelSet.loadModels(modelURI);
+		} catch (ModelMultiException e) {
+			fail(e.getMessage());
+		}
 
+		// Initialise an editing domain
+		modelSet.getTransactionalEditingDomain();
 
+		return modelSet;
 	}
 
 	/**
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/deletion/DeleteCommentLinkTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/deletion/DeleteCommentLinkTest.java
index e6dc1a0dc56..bcaca795840 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/deletion/DeleteCommentLinkTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/deletion/DeleteCommentLinkTest.java
@@ -40,7 +40,7 @@ import org.eclipse.papyrus.infra.core.services.ServiceException;
 import org.eclipse.papyrus.infra.emf.gmf.command.GMFtoEMFCommandWrapper;
 import org.eclipse.papyrus.infra.gmfdiag.common.editpart.ConnectionEditPart;
 import org.eclipse.papyrus.infra.gmfdiag.menu.utils.DeleteActionUtil;
-import org.eclipse.papyrus.infra.services.edit.internal.context.TypeContext;
+import org.eclipse.papyrus.infra.services.edit.context.TypeContext;
 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
 import org.eclipse.papyrus.infra.types.core.utils.ElementTypeRegistryUtils;
@@ -386,7 +386,7 @@ public class DeleteCommentLinkTest extends AbstractPapyrusTest {
 	protected EReference getFeatureToRemove(String visualId) {
 
 		try {
-			IClientContext context = TypeContext.getContext();
+			IClientContext context = TypeContext.getContext(fixture.getModel());
 			List<IElementType> elementTypes = ElementTypeRegistryUtils.getElementTypesBySemanticHint(visualId, context.getId());
 
 			for (IElementType iElementType : elementTypes) {
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/deletion/DeletePureUMLElementTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/deletion/DeletePureUMLElementTest.java
index e9f44667518..8dd46ae4362 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/deletion/DeletePureUMLElementTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/deletion/DeletePureUMLElementTest.java
@@ -22,6 +22,8 @@ import java.util.Collections;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.Platform;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
@@ -29,9 +31,13 @@ import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;
 import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;
+import org.eclipse.papyrus.infra.core.resource.ModelMultiException;
+import org.eclipse.papyrus.infra.core.resource.ModelSet;
 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
 import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
+import org.eclipse.papyrus.junit.utils.ModelUtils;
+import org.eclipse.papyrus.junit.utils.PapyrusProjectUtils;
 import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
 import org.eclipse.uml2.uml.Activity;
 import org.eclipse.uml2.uml.ActivityNode;
@@ -62,6 +68,8 @@ public class DeletePureUMLElementTest extends AbstractPapyrusTest {
 
 	private static Resource resource;
 
+	private static ModelSet modelSet;
+
 	private static TransactionalEditingDomain domain;
 
 	private static Activity testActivityDelete;
@@ -81,18 +89,30 @@ public class DeletePureUMLElementTest extends AbstractPapyrusTest {
 
 		// create UML resource
 		// import test model
-		copyPapyrusModel = houseKeeper.createFile(createProject, "TestPureUMLModel.uml", "/resource/TestPureUMLModel.uml");
+		try {
+			copyPapyrusModel = PapyrusProjectUtils.copyPapyrusModel(
+					createProject, 
+					Platform.getBundle("org.eclipse.papyrus.uml.service.types.tests"),
+					"/resource/", "TestPureUMLModel");
+		} catch (CoreException e) {
+			fail(e.getMessage());
+		} catch (IOException e) {
+			fail(e.getMessage());
+		}
 
 		// open model as UML resource
-		domain = TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain();
-		resource = domain.getResourceSet().createResource(URI.createPlatformResourceURI(copyPapyrusModel.getFullPath().toString(), true));
+		final URI clientModelDiURI = URI.createPlatformResourceURI(createProject.getName() + '/' + copyPapyrusModel.getName(), true);
 		try {
-			resource.load(Collections.emptyMap());
-		} catch (IOException e) {
+			modelSet = ModelUtils.loadModelSet(clientModelDiURI, true);
+		} catch (ModelMultiException e) {
 			fail(e.getMessage());
 		}
+		domain = ModelUtils.getEditingDomain(modelSet);
+
+		final URI clientModelUmlURI = URI.createPlatformResourceURI(createProject.getName() + '/' + "TestPureUMLModel.uml", true);
+		resource = modelSet.getResource(clientModelUmlURI, true);
 
-		rootModel = (Model)resource.getContents().get(0);
+		rootModel = (Model) resource.getContents().get(0);
 		assertNotNull("Model should not be null", rootModel);
 		try {
 			initExistingElements();
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/deletion/DeleteTransitionsWithVertexTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/deletion/DeleteTransitionsWithVertexTest.java
index 9ad994b393d..4f4ad4ac3e6 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/deletion/DeleteTransitionsWithVertexTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/deletion/DeleteTransitionsWithVertexTest.java
@@ -28,7 +28,6 @@ import org.eclipse.papyrus.junit.utils.rules.HouseKeeper;
 import org.eclipse.papyrus.junit.utils.rules.ModelSetFixture;
 import org.eclipse.papyrus.junit.utils.rules.PluginResource;
 import org.eclipse.papyrus.junit.utils.rules.ServiceRegistryModelSetFixture;
-import org.eclipse.papyrus.uml.service.types.helper.advice.VertexEditHelperAdvice;
 import org.eclipse.uml2.uml.Region;
 import org.eclipse.uml2.uml.StateMachine;
 import org.eclipse.uml2.uml.Transition;
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/registry/TestElementTypeRegistryContent.java b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/registry/TestElementTypeRegistryContent.java
index 39abb1165d6..439734247b0 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/registry/TestElementTypeRegistryContent.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.tests/src/org/eclipse/papyrus/uml/service/types/tests/registry/TestElementTypeRegistryContent.java
@@ -1,136 +1,143 @@
-/*****************************************************************************

- * Copyright (c) 2011, 2015 CEA LIST, Christian W. Damus, and others.

- *    

- * 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:

- *  Yann Tanguy - Initial API and implementation

- *  Christian W. Damus - bug 451230

- *

- *****************************************************************************/

-package org.eclipse.papyrus.uml.service.types.tests.registry;

-

-import static org.junit.Assert.assertFalse;

-import static org.junit.Assert.assertTrue;

-import static org.junit.Assert.fail;

-

-import java.util.Iterator;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.gmf.runtime.emf.type.core.ClientContextManager;

-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;

-import org.eclipse.gmf.runtime.emf.type.core.IClientContext;

-import org.eclipse.gmf.runtime.emf.type.core.IElementType;

-import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;

-import org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper;

-import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;

-import org.eclipse.uml2.uml.UMLPackage;

-import org.eclipse.uml2.uml.profile.standard.StandardPackage;

-import org.junit.Test;

-

-/**

- *

- */

-public class TestElementTypeRegistryContent {

-

-	private static final String PAPYRUS_CONTEXT_ID = "org.eclipse.papyrus.infra.services.edit.TypeContext"; //$NON-NLS-1$

-

-	private static final String PAPYRUS_ELEMENT_TYPE_PREFIX = "org.eclipse.papyrus.uml."; //$NON-NLS-1$

-

-	private static final String PAPYRUS_ST_APPLICATION_TYPE_PREFIX = "org.eclipse.papyrus.uml.stereotype."; //$NON-NLS-1$

-

-	private static final String PAPYRUS_INVALID_PREFIX = "org.eclipse.papyrus.uml.diagram"; //$NON-NLS-1$

-

-	@Test

-	public void testRegistryContentForUML() {

-

-		IClientContext context = ClientContextManager.getInstance().getClientContext(PAPYRUS_CONTEXT_ID);

-		if (context == null) {

-			fail("Papyrus IClientContext could not be found.");

-		}

-

-		// Iterate over UML2 contents

-		Iterator<EObject> it = UMLPackage.eINSTANCE.eAllContents();

-		while (it.hasNext()) {

-			EObject eObject = it.next();

-			if (eObject instanceof EClass) {

-				EClass eClass = (EClass) eObject;

-				IElementType elementType = ElementTypeRegistry.getInstance().getElementType(eClass, context);

-

-				// An IElementType is supposed to be registered for any meta-class in the UML type service.

-				assertTrue("No IElementType registered for eClass (" + eClass.getName() + ")", elementType != null);

-				// An IElementType is supposed to be registered for any meta-class in the UML type service.

-				assertTrue("Unexpected IElementType id (" + elementType.getId() + ")", elementType.getId().startsWith(PAPYRUS_ELEMENT_TYPE_PREFIX));

-				assertFalse("Unexpected IElementType id (" + elementType.getId() + ")", elementType.getId().startsWith(PAPYRUS_INVALID_PREFIX));

-				// Ensure a correct base is used for Helper

-				assertTrue("Incorrect edit helper hierarchy for element type (" + elementType.getId() + ")", elementType.getEditHelper() instanceof DefaultEditHelper);

-			}

-		}

-	}

-

-	@Test

-	public void testRegistryContentForUMLStandard() {

-

-		// Iterate over UML2 Standard profile contents

-		Iterator<EObject> it = StandardPackage.eINSTANCE.eAllContents();

-		while (it.hasNext()) {

-			EObject eObject = it.next();

-			if (eObject instanceof EClass) {

-				EClass eClass = (EClass) eObject;

-

-				if (!"Trace".equals(eClass.getName()) && !"Refine".equals(eClass.getName())) {

-					// Not implemented

-					continue;

-				}

-

-				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider().isKnownElementType(PAPYRUS_ELEMENT_TYPE_PREFIX + eClass.getName()));

-

-			}

-		}

-	}

-

-	@Test

-	public void testRegistryContentForUMLStandardStereotypeApplication() {

-

-		// Iterate over UML2 Standard profile contents

-		Iterator<EObject> it = StandardPackage.eINSTANCE.eAllContents();

-		while (it.hasNext()) {

-			EObject eObject = it.next();

-			if (eObject instanceof EClass) {

-				EClass eClass = (EClass) eObject;

-

-				if (!"Trace".equals(eClass.getName()) && !"Refine".equals(eClass.getName())) {

-					// Not implemented

-					continue;

-				}

-

-				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider().isKnownElementType(PAPYRUS_ST_APPLICATION_TYPE_PREFIX + eClass.getName()));

-

-			}

-		}

-	}

-

-	@Test

-	public void testRegistryContentForUMLAssociations() {

-

-		IClientContext context = ClientContextManager.getInstance().getClientContext(PAPYRUS_CONTEXT_ID);

-		if (context == null) {

-			fail("Papyrus IClientContext could not be found.");

-		}

-

-		IElementType associationBaseElementType = ElementTypeRegistry.getInstance().getElementType(UMLPackage.eINSTANCE.getAssociation(), context);

-		assertTrue("Incorrect id for base Association element type (" + associationBaseElementType.getId() + ")", associationBaseElementType.getId().equals("org.eclipse.papyrus.uml.AssociationBase"));

-

-		IElementType associationElementType = ElementTypeRegistry.getInstance().getType("org.eclipse.papyrus.uml.Association");

-		assertTrue("No ISpecializationType found for UML Association in Papyrus context", ElementEditServiceUtils.getEditServiceProvider().isKnownElementType("org.eclipse.papyrus.uml.Association"));

-		assertTrue("Incorrect kind of ElementType (ISpecializationType expected for " + associationElementType.getId() + ")", associationElementType instanceof ISpecializationType);

-		ISpecializationType associationSpecializationType = (ISpecializationType) associationElementType;

-		assertTrue("Incorrect specialization type hierarchy for " + associationElementType.getId(), associationSpecializationType.isSpecializationOf(associationBaseElementType));

-

-	}

-

-}

+/*****************************************************************************
+ * Copyright (c) 2011, 2015 CEA LIST, Christian W. Damus, and others.
+ *    
+ * 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:
+ *  Yann Tanguy - Initial API and implementation
+ *  Christian W. Damus - bug 451230
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.service.types.tests.registry;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.Iterator;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
+import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.emf.type.core.ISpecializationType;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.gmfdiag.common.helper.DefaultEditHelper;
+import org.eclipse.papyrus.infra.services.edit.context.TypeContext;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.uml2.uml.UMLPackage;
+import org.eclipse.uml2.uml.profile.standard.StandardPackage;
+import org.junit.Test;
+
+/**
+ *
+ */
+public class TestElementTypeRegistryContent {
+
+	private IClientContext context;
+	
+	private static final String PAPYRUS_ELEMENT_TYPE_PREFIX = "org.eclipse.papyrus.uml."; //$NON-NLS-1$
+
+	private static final String PAPYRUS_ST_APPLICATION_TYPE_PREFIX = "org.eclipse.papyrus.uml.stereotype."; //$NON-NLS-1$
+
+	private static final String PAPYRUS_INVALID_PREFIX = "org.eclipse.papyrus.uml.diagram"; //$NON-NLS-1$
+
+	public TestElementTypeRegistryContent() {
+		try {
+			context = TypeContext.getDefaultContext();
+		} catch (ServiceException e) {
+			fail("Default client context could not be found.");
+			return;
+		}
+	}
+	
+	@Test
+	public void testRegistryContentForUML() {
+		// Iterate over UML2 contents
+		Iterator<EObject> it = UMLPackage.eINSTANCE.eAllContents();
+		while (it.hasNext()) {
+			EObject eObject = it.next();
+			if (eObject instanceof EClass) {
+				EClass eClass = (EClass) eObject;
+				IElementType elementType = ElementTypeRegistry.getInstance().getElementType(eClass, context);
+
+				// An IElementType is supposed to be registered for any meta-class in the UML type service.
+				assertTrue("No IElementType registered for eClass (" + eClass.getName() + ")", elementType != null);
+				// An IElementType is supposed to be registered for any meta-class in the UML type service.
+				assertTrue("Unexpected IElementType id (" + elementType.getId() + ")", elementType.getId().startsWith(PAPYRUS_ELEMENT_TYPE_PREFIX));
+				assertFalse("Unexpected IElementType id (" + elementType.getId() + ")", elementType.getId().startsWith(PAPYRUS_INVALID_PREFIX));
+				// Ensure a correct base is used for Helper
+				assertTrue("Incorrect edit helper hierarchy for element type (" + elementType.getId() + ")", elementType.getEditHelper() instanceof DefaultEditHelper);
+			}
+		}
+	}
+
+	@Test
+	public void testRegistryContentForUMLStandard() {
+
+		// Iterate over UML2 Standard profile contents
+		Iterator<EObject> it = StandardPackage.eINSTANCE.eAllContents();
+		while (it.hasNext()) {
+			EObject eObject = it.next();
+			if (eObject instanceof EClass) {
+				EClass eClass = (EClass) eObject;
+
+				if (!"Trace".equals(eClass.getName()) && !"Refine".equals(eClass.getName())) {
+					// Not implemented
+					continue;
+				}
+
+				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider(context).isKnownElementType(PAPYRUS_ELEMENT_TYPE_PREFIX + eClass.getName()));
+
+			}
+		}
+	}
+
+	@Test
+	public void testRegistryContentForUMLStandardStereotypeApplication() {
+
+		// Iterate over UML2 Standard profile contents
+		Iterator<EObject> it = StandardPackage.eINSTANCE.eAllContents();
+		while (it.hasNext()) {
+			EObject eObject = it.next();
+			if (eObject instanceof EClass) {
+				EClass eClass = (EClass) eObject;
+
+				if (!"Trace".equals(eClass.getName()) && !"Refine".equals(eClass.getName())) {
+					// Not implemented
+					continue;
+				}
+
+				assertTrue("No type found in Papyrus context for " + eClass.getName(), ElementEditServiceUtils.getEditServiceProvider(context).isKnownElementType(PAPYRUS_ST_APPLICATION_TYPE_PREFIX + eClass.getName()));
+
+			}
+		}
+	}
+
+	@Test
+	public void testRegistryContentForUMLAssociations() {
+
+		IClientContext context;
+		try {
+			context = TypeContext.getDefaultContext();
+		} catch (ServiceException e) {
+			fail("Default client context could not be found.");
+			return;
+		}
+
+		IElementType associationBaseElementType = ElementTypeRegistry.getInstance().getElementType(UMLPackage.eINSTANCE.getAssociation(), context);
+		assertTrue("Incorrect id for base Association element type (" + associationBaseElementType.getId() + ")", associationBaseElementType.getId().equals("org.eclipse.papyrus.uml.AssociationBase"));
+
+		IElementType associationElementType = ElementTypeRegistry.getInstance().getType("org.eclipse.papyrus.uml.Association");
+		assertTrue("No ISpecializationType found for UML Association in Papyrus context", ElementEditServiceUtils.getEditServiceProvider(context).isKnownElementType("org.eclipse.papyrus.uml.Association"));
+		assertTrue("Incorrect kind of ElementType (ISpecializationType expected for " + associationElementType.getId() + ")", associationElementType instanceof ISpecializationType);
+		ISpecializationType associationSpecializationType = (ISpecializationType) associationElementType;
+		assertTrue("Incorrect specialization type hierarchy for " + associationElementType.getId(), associationSpecializationType.isSpecializationOf(associationBaseElementType));
+
+	}
+
+}
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/creation/AbstractCreateRelationshipTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/creation/AbstractCreateRelationshipTest.java
index 94d4fa047c2..fb28e0993b9 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/creation/AbstractCreateRelationshipTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/creation/AbstractCreateRelationshipTest.java
@@ -24,6 +24,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
 import org.eclipse.jface.viewers.ILabelProvider;
@@ -32,6 +33,7 @@ import org.eclipse.jface.window.Window;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
 import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
 import org.eclipse.papyrus.infra.newchild.SetTargetAndRelationshipCommand;
+import org.eclipse.papyrus.infra.services.edit.context.TypeContext;
 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
 import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
@@ -185,7 +187,13 @@ public abstract class AbstractCreateRelationshipTest extends AbstractPapyrusTest
 	 * @return
 	 */
 	protected ICommand buildWrappedRelationshipCommand(TransactionalEditingDomain ted, IElementType elementType, EObject container, EObject target, EReference reference) {
-		IElementEditService serviceProvider = ElementEditServiceUtils.getCommandProvider(elementType);
+		IClientContext context;
+		try {
+			context = TypeContext.getContext(ted);
+		} catch (ServiceException e) {
+			return null;
+		}
+		IElementEditService serviceProvider = ElementEditServiceUtils.getCommandProvider(elementType, context);
 		ITreeSelectorDialog dialog = new TestTargetSelectionDialog(target);
 		SetTargetAndRelationshipCommand createGMFCommand = new SetTargetAndRelationshipCommand(ted, "Create " + elementType.getDisplayName(), serviceProvider, reference, container, elementType, dialog);
 		return createGMFCommand;
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/creation/CreateRelationshipTest.java b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/creation/CreateRelationshipTest.java
index 3a73db51f61..0c7483bcb13 100644
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/creation/CreateRelationshipTest.java
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.service.types.ui.tests/src/org/eclipse/papyrus/uml/service/types/ui/tests/creation/CreateRelationshipTest.java
@@ -29,6 +29,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.gmf.runtime.common.core.command.ICommand;
+import org.eclipse.gmf.runtime.emf.type.core.IClientContext;
 import org.eclipse.gmf.runtime.emf.type.core.IElementType;
 import org.eclipse.gmf.runtime.emf.type.core.IHintedType;
 import org.eclipse.jface.viewers.ILabelProvider;
@@ -40,6 +41,7 @@ import org.eclipse.papyrus.infra.core.resource.NotFoundException;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
 import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
 import org.eclipse.papyrus.infra.newchild.SetTargetAndRelationshipCommand;
+import org.eclipse.papyrus.infra.services.edit.context.TypeContext;
 import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
 import org.eclipse.papyrus.infra.widgets.editors.ITreeSelectorDialog;
@@ -704,7 +706,13 @@ public class CreateRelationshipTest extends AbstractCreateRelationshipTest {
 	 */
 	@Override
 	protected ICommand buildWrappedRelationshipCommand(TransactionalEditingDomain ted, IElementType elementType, EObject source, EObject target, EReference reference) {
-		IElementEditService serviceProvider = ElementEditServiceUtils.getCommandProvider(elementType);
+		IClientContext context;
+		try {
+			context = TypeContext.getContext(ted);
+		} catch (ServiceException e) {
+			return null;
+		}
+		IElementEditService serviceProvider = ElementEditServiceUtils.getCommandProvider(elementType, context);
 		ITreeSelectorDialog dialog = new TestTargetSelectionDialog(target);
 		SetTargetAndRelationshipCommand createGMFCommand = new SetTargetAndRelationshipCommand(ted, "Create " + elementType.getDisplayName(), serviceProvider, reference, source, elementType, dialog);
 		return createGMFCommand;
diff --git a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/META-INF/MANIFEST.MF
index eb74c31ea91..c13eb02ddc8 100755
--- a/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/org.eclipse.papyrus.uml.suite.tests/META-INF/MANIFEST.MF
@@ -36,4 +36,3 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.uml.dynamic.profile.tests;bundle-version="1.2.0",
  org.eclipse.papyrus.uml.internationalization.tests;bundle-version="1.0.0",
  org.eclipse.papyrus.uml.alf.tests;bundle-version="1.2.0"
- 
\ No newline at end of file
diff --git a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/META-INF/MANIFEST.MF
index 592dd0716d9..ef4bd13576a 100755
--- a/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.suite.tests/META-INF/MANIFEST.MF
@@ -18,4 +18,3 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.uml.textedit.parameter.tests;bundle-version="1.2.0",
  org.eclipse.papyrus.uml.textedit.valuespecification.tests;bundle-version="1.2.0",
  org.eclipse.papyrus.uml.textedit.tests;bundle-version="1.2.0"
- 
\ No newline at end of file