Merge branch 'maintenance-0.12' into maintenance-0.13

Conflicts:
	.gitignore
	.project
	org.eclipse.gmt.modisco.examples/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.browser.custom.core/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.browser.custom.editor/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.browser.custom.examples.java.jdk/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.browser.custom.examples.uml/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.browser.custom.ui/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.browser.custom/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.browser.uicore/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.browser/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.capabilities/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.common.cdo.derby/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.common.cdo/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.common.core/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.common.ui/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.discoverymanager/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.facet.core/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.facet.edit/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.facet.editor/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.facet.examples.kdm/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.facet.ui/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.facet/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.prefuse/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.query.core/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.query.edit/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.query.editor/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.query.jxpath/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.query.ui/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.infra.query/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.java.browser.customization/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.java.cdo/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.java.classiceobject/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.java.discoverer.benchmark.tests/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.java.discoverer.benchmark/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.java.discoverer.cdo.tests/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.java.discoverer.cdo/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.java.discoverer.tests/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.java.discoverer/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.java.generation/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.java.nousages.cdo/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.java.nousages/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.java.queries/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.java/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.kdm.browser.extension/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.kdm.source.discoverer/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.kdm.uml2converter.tests/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.kdm.uml2converter/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.omg.kdm/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.omg.smm/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.tool.metricsvisualizationbuilder/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.usecase.modelfilter/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.usecase.simpletransformationschain/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.workflow.mwe/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.workflow/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.xml.browser.customization/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.xml.discoverer.tests/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.xml.discoverer/META-INF/MANIFEST.MF
	org.eclipse.gmt.modisco.xml/META-INF/MANIFEST.MF
	org.eclipse.modisco.all.feature/feature.xml
	org.eclipse.modisco.archi.tech.targetplatform/org.eclipse.modisco.archi.tech.targetplatform.target
	org.eclipse.modisco.common.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.dev.doc/META-INF/MANIFEST.MF
	org.eclipse.modisco.doc.api.report/META-INF/MANIFEST.MF
	org.eclipse.modisco.doc.metric.report/META-INF/MANIFEST.MF
	org.eclipse.modisco.doc.test.report/META-INF/MANIFEST.MF
	org.eclipse.modisco.doc.test.report/pom.xsl
	org.eclipse.modisco.doc/META-INF/MANIFEST.MF
	org.eclipse.modisco.eclipseplugin.discoverer.ui/META-INF/MANIFEST.MF
	org.eclipse.modisco.eclipseplugin.discoverer/META-INF/MANIFEST.MF
	org.eclipse.modisco.eclipseplugin/META-INF/MANIFEST.MF
	org.eclipse.modisco.examples.feature/feature.xml
	org.eclipse.modisco.infra.browser.custom.examples.generation/META-INF/MANIFEST.MF
	org.eclipse.modisco.infra.browser.custom.examples.java.jdk.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.infra.browser.custom.examples.uml.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.infra.browser.custom.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.infra.browser.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.infra.cdo.derby.feature/feature.xml
	org.eclipse.modisco.infra.common.core.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.infra.discovery.benchmark.core/META-INF/MANIFEST.MF
	org.eclipse.modisco.infra.discovery.benchmark.doc.archi/META-INF/MANIFEST.MF
	org.eclipse.modisco.infra.discovery.benchmark.feature/feature.xml
	org.eclipse.modisco.infra.discovery.benchmark.metamodel/META-INF/MANIFEST.MF
	org.eclipse.modisco.infra.discovery.benchmark.ui/META-INF/MANIFEST.MF
	org.eclipse.modisco.infra.discovery.benchmark/META-INF/MANIFEST.MF
	org.eclipse.modisco.infra.discovery.core.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.infra.discovery.core/META-INF/MANIFEST.MF
	org.eclipse.modisco.infra.discovery.ui.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.infra.discovery.ui/META-INF/MANIFEST.MF
	org.eclipse.modisco.infra.discovery/META-INF/MANIFEST.MF
	org.eclipse.modisco.infra.discoverymanager.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.infra.doc.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.infra.facet.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.infra.omg.doc/META-INF/MANIFEST.MF
	org.eclipse.modisco.infra.omg.feature/feature.xml
	org.eclipse.modisco.infra.query.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.infrastructure.doc.archi/META-INF/MANIFEST.MF
	org.eclipse.modisco.infrastructure.doc/META-INF/MANIFEST.MF
	org.eclipse.modisco.infrastructure.feature/feature.xml
	org.eclipse.modisco.java.browser.customization.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.java.cdo.feature/feature.xml
	org.eclipse.modisco.java.composition.browser.customization/META-INF/MANIFEST.MF
	org.eclipse.modisco.java.composition.discoverer.benchmark/META-INF/MANIFEST.MF
	org.eclipse.modisco.java.composition.discoverer.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.java.composition.discoverer.ui/META-INF/MANIFEST.MF
	org.eclipse.modisco.java.composition.discoverer/META-INF/MANIFEST.MF
	org.eclipse.modisco.java.composition.ui/META-INF/MANIFEST.MF
	org.eclipse.modisco.java.composition/META-INF/MANIFEST.MF
	org.eclipse.modisco.java.discoverer.benchmark.feature/feature.xml
	org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/META-INF/MANIFEST.MF
	org.eclipse.modisco.java.discoverer.benchmark.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.java.discoverer.benchmark/META-INF/MANIFEST.MF
	org.eclipse.modisco.java.discoverer.cdo.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.java.discoverer.cdo/META-INF/MANIFEST.MF
	org.eclipse.modisco.java.discoverer.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.java.discoverer.ui/META-INF/MANIFEST.MF
	org.eclipse.modisco.java.discoverer/META-INF/MANIFEST.MF
	org.eclipse.modisco.java.doc.archi/META-INF/MANIFEST.MF
	org.eclipse.modisco.java.doc/META-INF/MANIFEST.MF
	org.eclipse.modisco.java.feature/feature.xml
	org.eclipse.modisco.java.generation.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.java.queries.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.jee.doc.archi/META-INF/MANIFEST.MF
	org.eclipse.modisco.jee.doc/META-INF/MANIFEST.MF
	org.eclipse.modisco.jee.ejbjar.discoverer.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.jee.ejbjar.discoverer.ui/META-INF/MANIFEST.MF
	org.eclipse.modisco.jee.ejbjar.discoverer/META-INF/MANIFEST.MF
	org.eclipse.modisco.jee.ejbjar/META-INF/MANIFEST.MF
	org.eclipse.modisco.jee.facet/META-INF/MANIFEST.MF
	org.eclipse.modisco.jee.feature/feature.xml
	org.eclipse.modisco.jee.jsp.browser.customization/META-INF/MANIFEST.MF
	org.eclipse.modisco.jee.jsp.discoverer.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.jee.jsp.discoverer.ui/META-INF/MANIFEST.MF
	org.eclipse.modisco.jee.jsp.discoverer/META-INF/MANIFEST.MF
	org.eclipse.modisco.jee.jsp.generation.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.jee.jsp.generation/META-INF/MANIFEST.MF
	org.eclipse.modisco.jee.jsp/META-INF/MANIFEST.MF
	org.eclipse.modisco.jee.queries.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.jee.queries/META-INF/MANIFEST.MF
	org.eclipse.modisco.jee.webapp.discoverer.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.jee.webapp.discoverer.ui/META-INF/MANIFEST.MF
	org.eclipse.modisco.jee.webapp.discoverer/META-INF/MANIFEST.MF
	org.eclipse.modisco.jee.webapp/META-INF/MANIFEST.MF
	org.eclipse.modisco.jee/META-INF/MANIFEST.MF
	org.eclipse.modisco.kdm.source.discoverer.ui/META-INF/MANIFEST.MF
	org.eclipse.modisco.kdm.source.discoverer/META-INF/MANIFEST.MF
	org.eclipse.modisco.kdm.source.extension.ui.browser/META-INF/MANIFEST.MF
	org.eclipse.modisco.kdm.source.extension.ui/META-INF/MANIFEST.MF
	org.eclipse.modisco.kdm.source.extension/META-INF/MANIFEST.MF
	org.eclipse.modisco.kdm.uml2converter.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.kdm.uml2converter.ui/META-INF/MANIFEST.MF
	org.eclipse.modisco.kdm.uml2converter/META-INF/MANIFEST.MF
	org.eclipse.modisco.manifest.discoverer.ui/META-INF/MANIFEST.MF
	org.eclipse.modisco.manifest.discoverer/META-INF/MANIFEST.MF
	org.eclipse.modisco.manifest/META-INF/MANIFEST.MF
	org.eclipse.modisco.omg.gastm/META-INF/MANIFEST.MF
	org.eclipse.modisco.omg.smm/META-INF/MANIFEST.MF
	org.eclipse.modisco.properties.discoverer.ui/META-INF/MANIFEST.MF
	org.eclipse.modisco.properties.discoverer/META-INF/MANIFEST.MF
	org.eclipse.modisco.releng.tycho/helios/releng.properties
	org.eclipse.modisco.releng.tycho/helios/targetPlatform.xml
	org.eclipse.modisco.releng.tycho/indigo/releng.properties
	org.eclipse.modisco.releng.tycho/indigo/targetPlatform.xml
	org.eclipse.modisco.releng.tycho/local/releng.properties
	org.eclipse.modisco.releng.tycho/releasetrain/build.sh
	org.eclipse.modisco.releng.tycho/releasetrain/releng.properties
	org.eclipse.modisco.sdk.doc/META-INF/MANIFEST.MF
	org.eclipse.modisco.sdk.feature/feature.xml
	org.eclipse.modisco.smm.quality/META-INF/MANIFEST.MF
	org.eclipse.modisco.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.thirdparties.feature/feature.xml
	org.eclipse.modisco.updatesite/site.xml
	org.eclipse.modisco.usecase.java.samplemetrics/META-INF/MANIFEST.MF
	org.eclipse.modisco.usecase.java.samplerefactoring/META-INF/MANIFEST.MF
	org.eclipse.modisco.usecase.modelfilter.dependencies.ui/META-INF/MANIFEST.MF
	org.eclipse.modisco.usecase.modelfilter.doc/META-INF/MANIFEST.MF
	org.eclipse.modisco.usecase.modelfilter.feature/feature.xml
	org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui/META-INF/MANIFEST.MF
	org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer/META-INF/MANIFEST.MF
	org.eclipse.modisco.usecase.modelfilter.methodcalls/META-INF/MANIFEST.MF
	org.eclipse.modisco.usecase.modelfilter.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.usecase.modelfilter.ui/META-INF/MANIFEST.MF
	org.eclipse.modisco.usecase.modelfilter/META-INF/MANIFEST.MF
	org.eclipse.modisco.usecase.simpletransformationchain.doc/META-INF/MANIFEST.MF
	org.eclipse.modisco.usecase.simpletransformationschain.feature/feature.xml
	org.eclipse.modisco.usecase.simpletransformationschain.ui/META-INF/MANIFEST.MF
	org.eclipse.modisco.usecase.simpletransformationschain/META-INF/MANIFEST.MF
	org.eclipse.modisco.util.atl.core/META-INF/MANIFEST.MF
	org.eclipse.modisco.utils.chart.birt.core.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.utils.chart.birt.core/META-INF/MANIFEST.MF
	org.eclipse.modisco.utils.chart.feature/feature.xml
	org.eclipse.modisco.utils.chart.metamodel/META-INF/MANIFEST.MF
	org.eclipse.modisco.utils.core/META-INF/MANIFEST.MF
	org.eclipse.modisco.workflow.core/META-INF/MANIFEST.MF
	org.eclipse.modisco.workflow.ui/META-INF/MANIFEST.MF
	org.eclipse.modisco.workflow/META-INF/MANIFEST.MF
	org.eclipse.modisco.xml.discoverer.tests/META-INF/MANIFEST.MF
	org.eclipse.modisco.xml.discoverer.ui/META-INF/MANIFEST.MF
	org.eclipse.modisco.xml.discoverer/META-INF/MANIFEST.MF
	org.eclipse.modisco.xml.doc/META-INF/MANIFEST.MF
	org.eclipse.modisco.xml.feature/feature.xml

Change-Id: I1de932a42e726848721f3a788a132874222af21f
diff --git a/.gitignore b/.gitignore
index 6634f79..05ddc70 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,17 +1,21 @@
-/**/__target__/

-/*/bin/

-/*/pom.xml

-/*/pom.xml.*

-/*/pom.xml.configure-quality-poms.bak

-/*.doc/mediawiki/*.html

-/*.doc/mediawiki/*.xml

-/*.doc/toc.html

-/*.doc.archi/mediawiki/*.html

-/*.doc.archi/mediawiki/*.xml

-/*.tests/screenshots/

-/*.eclipsepackage/pom_updated_modules.xml

-/*.targetplatform/pom.tmp.xml

-/*.updatesite/category.xml

-/*.updatesite/pom_after_updatesite.xml

-/*.updatesite/poma.xml

-

+/**/__target__/
+/*.doc.archi/mediawiki/*.html
+/*.doc.archi/mediawiki/*.xml
+/*.doc/mediawiki/**/*.html
+/*.doc/mediawiki/**/*.xml
+/*.doc/mediawiki/*.html
+/*.doc/mediawiki/*.xml
+/*.doc/toc.html
+/*.eclipsepackage/pom_updated_modules.xml
+/*.targetplatform/pom.tmp.xml
+/*.tests/screenshots/
+/*.updatesite/category.xml
+/*.updatesite/pom_after_updatesite.xml
+/*.updatesite/poma.xml
+/*/bin/
+/*/pom.xml
+/*/pom.xml.*
+/*/pom.xml.configure-quality-poms.bak
+/*source.feature
+/pom.xml*
+/pom_after_configure.xml
diff --git a/.project b/.project
index a9d0ad3..d2eeda2 100644
--- a/.project
+++ b/.project
@@ -4,4 +4,8 @@
 	<comment></comment>

 	<projects>

 	</projects>

+	<buildSpec>

+	</buildSpec>

+	<natures>

+	</natures>

 </projectDescription>

diff --git a/CONTRIBUTING b/CONTRIBUTING
new file mode 100644
index 0000000..486be2a
--- /dev/null
+++ b/CONTRIBUTING
@@ -0,0 +1,54 @@
+Contributing to MoDisco

+=======================

+

+Thanks for your interest in this project.

+

+Project description:

+--------------------

+

+MoDisco provides an extensible framework to elaborate on model-driven solutions supporting software reverse engineering and modernization use cases such as technical migration, software improvement, documentation generation, quality insurance, etc.

+

+Legacy systems embrace a large number of technologies, making the development of tools to cope with legacy systems evolution a tedious and time consuming task. As modernization projects face with both technologies combination and various modernization situations, model-driven approaches and tools offer the requisite abstraction level to build up mature and flexible modernization solutions.

+ - Quality Assurance: verifying whether an existing system meets the required qualities (detection of anti-patterns in existing code and computation of metrics.)

+ - Documentation: extraction of information from an existing system to help understanding one aspect of this system (structure, behaviour, persistence, data-flow, change impact , etc).

+ - Improvement: transformation of an existing system to integrate better coding norms or design patterns.

+ - Migration: transformation of an existing system to change a component, the framework, the language, or its architecture more about MoDisco

+

+- https://projects.eclipse.org/projects/modeling.mdt.modisco

+

+Developer resources:

+--------------------

+

+Information regarding source code management, builds, coding standards, and more.

+

+- https://projects.eclipse.org/projects/modeling.mdt.modisco/developer

+- https://wiki.eclipse.org/MoDisco#Getting_involved

+

+Contributor License Agreement:

+------------------------------

+

+Before your contribution can be accepted by the project, you need to create and electronically sign the Eclipse Foundation Contributor License Agreement (CLA).

+

+- http://www.eclipse.org/legal/CLA.php

+

+Contact:

+--------

+

+Contact the project developers via the project's "dev" list.

+

+- https://dev.eclipse.org/mailman/listinfo/mdt.dev

+

+Search for bugs:

+----------------

+

+This project uses Bugzilla to track ongoing development and issues.

+

+- https://bugs.eclipse.org/bugs/buglist.cgi?product=MDT.MoDisco

+

+Create a new bug:

+-----------------

+

+Be sure to search for existing bugs before you create another one. Remember that contributions are always welcome!

+

+- https://bugs.eclipse.org/bugs/enter_bug.cgi?product=MDT.MoDisco

+

diff --git a/org.eclipse.gmt.modisco.examples/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.examples/META-INF/MANIFEST.MF
index 83f184e..bb3f9ab 100644
--- a/org.eclipse.gmt.modisco.examples/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.examples/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.gmt.modisco.examples
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Vendor: %Bundle-Vendor
diff --git a/org.eclipse.gmt.modisco.examples/OSGI-INF/l10n/bundle.properties b/org.eclipse.gmt.modisco.examples/OSGI-INF/l10n/bundle.properties
index 3c046d9..3e5dfdf 100644
--- a/org.eclipse.gmt.modisco.examples/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.gmt.modisco.examples/OSGI-INF/l10n/bundle.properties
@@ -10,4 +10,4 @@
 ###############################################################################

 #Properties file for org.eclipse.gmt.modisco.examples

 Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = MoDisco Examples (Incubation)
\ No newline at end of file
+Bundle-Name = MoDisco Examples (Deprecated) (Incubation)
\ No newline at end of file
diff --git a/org.eclipse.gmt.modisco.infra.browser.custom.core/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.browser.custom.core/META-INF/MANIFEST.MF
index f459d9e..6ae8b60 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.browser.custom.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.browser.custom.core;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.gmt.modisco.infra.browser.custom.core.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.gmt.modisco.infra.browser.custom.core/OSGI-INF/l10n/bundle.properties b/org.eclipse.gmt.modisco.infra.browser.custom.core/OSGI-INF/l10n/bundle.properties
index 2cd4758..fb551c2 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom.core/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.gmt.modisco.infra.browser.custom.core/OSGI-INF/l10n/bundle.properties
@@ -10,6 +10,6 @@
 ###############################################################################

 #Properties file for org.eclipse.gmt.modisco.infra.browser.custom.core

 Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = MoDisco Customizations Core (Incubation)

+Bundle-Name = MoDisco Customizations Core (Deprecated) (Incubation)

 extension.name = CustomizationsBuilder

-extension-point.name = Browser customization registration
\ No newline at end of file
+extension-point.name = Browser customization registration (Deprecated)
\ No newline at end of file
diff --git a/org.eclipse.gmt.modisco.infra.browser.custom.core/src/org/eclipse/gmt/modisco/infra/browser/custom/core/Activator.java b/org.eclipse.gmt.modisco.infra.browser.custom.core/src/org/eclipse/gmt/modisco/infra/browser/custom/core/Activator.java
index a77420c..6789acc 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom.core/src/org/eclipse/gmt/modisco/infra/browser/custom/core/Activator.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom.core/src/org/eclipse/gmt/modisco/infra/browser/custom/core/Activator.java
@@ -19,7 +19,10 @@
 

 /**

  * The activator class controls the plug-in life cycle

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

  */

+@Deprecated

 public class Activator extends AbstractUIPlugin {

 

 	// The plug-in ID

diff --git a/org.eclipse.gmt.modisco.infra.browser.custom.core/src/org/eclipse/gmt/modisco/infra/browser/custom/core/CustomizationProtocolExt.java b/org.eclipse.gmt.modisco.infra.browser.custom.core/src/org/eclipse/gmt/modisco/infra/browser/custom/core/CustomizationProtocolExt.java
index 935428e..2d1fc89 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom.core/src/org/eclipse/gmt/modisco/infra/browser/custom/core/CustomizationProtocolExt.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom.core/src/org/eclipse/gmt/modisco/infra/browser/custom/core/CustomizationProtocolExt.java
@@ -13,6 +13,11 @@
 import org.eclipse.emf.common.util.URI;

 import org.eclipse.gmt.modisco.infra.common.core.internal.protocol.IModiscoProtocolExtension;

 

+/**

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

+ */

+@Deprecated

 public class CustomizationProtocolExt implements IModiscoProtocolExtension {

 

 	public String getSchemeSpecificPart() {

diff --git a/org.eclipse.gmt.modisco.infra.browser.custom.core/src/org/eclipse/gmt/modisco/infra/browser/custom/core/CustomizationsBuilder.java b/org.eclipse.gmt.modisco.infra.browser.custom.core/src/org/eclipse/gmt/modisco/infra/browser/custom/core/CustomizationsBuilder.java
index aacdf81..0259412 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom.core/src/org/eclipse/gmt/modisco/infra/browser/custom/core/CustomizationsBuilder.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom.core/src/org/eclipse/gmt/modisco/infra/browser/custom/core/CustomizationsBuilder.java
@@ -17,7 +17,10 @@
 /**

  * A builder that feeds and updates the {@link CustomizationsCatalog} with the

  * customization files it finds

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

  */

+@Deprecated

 public class CustomizationsBuilder extends MoDiscoCatalogBuilder {

 

 	protected static final String FILE_EXTENSION = "uiCustom"; //$NON-NLS-1$

diff --git a/org.eclipse.gmt.modisco.infra.browser.custom.core/src/org/eclipse/gmt/modisco/infra/browser/custom/core/CustomizationsCatalog.java b/org.eclipse.gmt.modisco.infra.browser.custom.core/src/org/eclipse/gmt/modisco/infra/browser/custom/core/CustomizationsCatalog.java
index 0138ae4..44d8547 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom.core/src/org/eclipse/gmt/modisco/infra/browser/custom/core/CustomizationsCatalog.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom.core/src/org/eclipse/gmt/modisco/infra/browser/custom/core/CustomizationsCatalog.java
@@ -48,7 +48,10 @@
  * <code>org.eclipse.gmt.modisco.infra.browser.custom.registration</code>. It is

  * updated by the {@link CustomizationsBuilder}, which is responsible for adding

  * and removing customization files in response to changes in the Workspace.

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

  */

+@Deprecated

 public class CustomizationsCatalog extends AbstractMoDiscoCatalog {

 

 	public static final String REGISTRATION_EXTENSION_POINT_ID = "org.eclipse.gmt.modisco.infra.browser.custom.core.registration"; //$NON-NLS-1$

diff --git a/org.eclipse.gmt.modisco.infra.browser.custom.core/src/org/eclipse/gmt/modisco/infra/browser/custom/core/CustomizationsRegistry.java b/org.eclipse.gmt.modisco.infra.browser.custom.core/src/org/eclipse/gmt/modisco/infra/browser/custom/core/CustomizationsRegistry.java
index 8ad9e61..48dd609 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom.core/src/org/eclipse/gmt/modisco/infra/browser/custom/core/CustomizationsRegistry.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom.core/src/org/eclipse/gmt/modisco/infra/browser/custom/core/CustomizationsRegistry.java
@@ -14,6 +14,11 @@
 import java.util.ArrayList;

 import java.util.List;

 

+/**

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

+ */

+@Deprecated

 public final class CustomizationsRegistry {

 

 	

diff --git a/org.eclipse.gmt.modisco.infra.browser.custom.core/src/org/eclipse/gmt/modisco/infra/browser/custom/core/Messages.java b/org.eclipse.gmt.modisco.infra.browser.custom.core/src/org/eclipse/gmt/modisco/infra/browser/custom/core/Messages.java
index 15610a6..5a3a44b 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom.core/src/org/eclipse/gmt/modisco/infra/browser/custom/core/Messages.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom.core/src/org/eclipse/gmt/modisco/infra/browser/custom/core/Messages.java
@@ -12,6 +12,11 @@
 

 import org.eclipse.osgi.util.NLS;

 

+/**

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

+ */

+@Deprecated

 public class Messages extends NLS {

 	private static final String BUNDLE_NAME = "org.eclipse.gmt.modisco.infra.browser.custom.core.messages"; //$NON-NLS-1$

 	public static String CustomizationsBuilder_customization;

diff --git a/org.eclipse.gmt.modisco.infra.browser.custom.editor/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.browser.custom.editor/META-INF/MANIFEST.MF
index 51724db..f84a1df 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom.editor/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.browser.custom.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.browser.custom.editor;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.gmt.modisco.infra.browser.custom.editor.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.gmt.modisco.infra.browser.custom.editor/OSGI-INF/l10n/bundle.properties b/org.eclipse.gmt.modisco.infra.browser.custom.editor/OSGI-INF/l10n/bundle.properties
index 0817eb2..a75609b 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom.editor/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.gmt.modisco.infra.browser.custom.editor/OSGI-INF/l10n/bundle.properties
@@ -10,5 +10,5 @@
 ###############################################################################

 #Properties file for org.eclipse.gmt.modisco.infra.browser.custom.editor

 Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = MoDisco Browser Customization Editor (Incubation)

-editor.name = Browser Customization Editor
\ No newline at end of file
+Bundle-Name = MoDisco Browser Customization Editor (Deprecated) (Incubation)

+editor.name = Browser Customization Editor (Deprecated)
\ No newline at end of file
diff --git a/org.eclipse.gmt.modisco.infra.browser.custom.examples.java.jdk/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.browser.custom.examples.java.jdk/META-INF/MANIFEST.MF
index 2b78a47..d977c88 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom.examples.java.jdk/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.browser.custom.examples.java.jdk/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.browser.custom.examples.java.jdk;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Vendor: 
  %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.gmt.modisco.infra.browser.custom.examples.java.jdk/OSGI-INF/l10n/bundle.properties b/org.eclipse.gmt.modisco.infra.browser.custom.examples.java.jdk/OSGI-INF/l10n/bundle.properties
index 1f08cb8..6fbe59a 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom.examples.java.jdk/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.gmt.modisco.infra.browser.custom.examples.java.jdk/OSGI-INF/l10n/bundle.properties
@@ -1,5 +1,5 @@
 #Properties file for org.eclipse.gmt.modisco.infra.browser.custom.examples.java.jdk

 Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = MoDisco JDK customization example (Incubation)

+Bundle-Name = MoDisco JDK customization example (Deprecated) (Incubation)

 wizard.name = JDK Java Browser Customization Example

 category.name = MoDisco Examples
\ No newline at end of file
diff --git a/org.eclipse.gmt.modisco.infra.browser.custom.examples.uml/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.browser.custom.examples.uml/META-INF/MANIFEST.MF
index db4f81c..d2381c3 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom.examples.uml/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.browser.custom.examples.uml/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.browser.custom.examples.uml;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Vendor: 
  %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.gmt.modisco.infra.browser.custom.examples.uml/OSGI-INF/l10n/bundle.properties b/org.eclipse.gmt.modisco.infra.browser.custom.examples.uml/OSGI-INF/l10n/bundle.properties
index 5d2cea6..b86a766 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom.examples.uml/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.gmt.modisco.infra.browser.custom.examples.uml/OSGI-INF/l10n/bundle.properties
@@ -2,4 +2,4 @@
 wizard.name = UML Browser Customization Example

 category.name = MoDisco Examples

 Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = MoDisco UML Browser Customization Example (Incubation)
\ No newline at end of file
+Bundle-Name = MoDisco UML Browser Customization Example (Deprecated) (Incubation)
\ No newline at end of file
diff --git a/org.eclipse.gmt.modisco.infra.browser.custom.ui/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.browser.custom.ui/META-INF/MANIFEST.MF
index 862ee46..1f2c3e2 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.browser.custom.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.browser.custom.ui;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.gmt.modisco.infra.browser.custom.ui.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.gmt.modisco.infra.browser.custom.ui/OSGI-INF/l10n/bundle.properties b/org.eclipse.gmt.modisco.infra.browser.custom.ui/OSGI-INF/l10n/bundle.properties
index fbb849f..ef75fef 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom.ui/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.gmt.modisco.infra.browser.custom.ui/OSGI-INF/l10n/bundle.properties
@@ -10,7 +10,7 @@
 ###############################################################################

 #Properties file for org.eclipse.gmt.modisco.infra.browser.custom.ui

 Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = MoDisco Browser Customization UI plug-in (Incubation)

+Bundle-Name = MoDisco Browser Customization UI plug-in (Deprecated) (Incubation)

 modisco.category.name = MoDisco

-customizations.view.name = Customizations

-newCustomization.wizard.name = Browser Customization
\ No newline at end of file
+customizations.view.name = Customizations (Deprecated)

+newCustomization.wizard.name = Browser Customization (Deprecated)
\ No newline at end of file
diff --git a/org.eclipse.gmt.modisco.infra.browser.custom.ui/src/org/eclipse/gmt/modisco/infra/browser/custom/ui/Activator.java b/org.eclipse.gmt.modisco.infra.browser.custom.ui/src/org/eclipse/gmt/modisco/infra/browser/custom/ui/Activator.java
index 98f5874..afebc93 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom.ui/src/org/eclipse/gmt/modisco/infra/browser/custom/ui/Activator.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom.ui/src/org/eclipse/gmt/modisco/infra/browser/custom/ui/Activator.java
@@ -19,7 +19,10 @@
 

 /**

  * The activator class controls the plug-in life cycle

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

  */

+@Deprecated

 public class Activator extends AbstractUIPlugin {

 

 	// The plug-in ID

diff --git a/org.eclipse.gmt.modisco.infra.browser.custom.ui/src/org/eclipse/gmt/modisco/infra/browser/custom/ui/Messages.java b/org.eclipse.gmt.modisco.infra.browser.custom.ui/src/org/eclipse/gmt/modisco/infra/browser/custom/ui/Messages.java
index 7a8dfd0..825203a 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom.ui/src/org/eclipse/gmt/modisco/infra/browser/custom/ui/Messages.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom.ui/src/org/eclipse/gmt/modisco/infra/browser/custom/ui/Messages.java
@@ -12,6 +12,11 @@
 

 import org.eclipse.osgi.util.NLS;

 

+/**

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

+ */

+@Deprecated

 public final class Messages extends NLS {

 	private static final String BUNDLE_NAME = "org.eclipse.gmt.modisco.infra.browser.custom.ui.messages"; //$NON-NLS-1$

 	public static String CustomizationsView_allQuerySets;

diff --git a/org.eclipse.gmt.modisco.infra.browser.custom.ui/src/org/eclipse/gmt/modisco/infra/browser/custom/ui/controls/QuerySetsSelectionControl.java b/org.eclipse.gmt.modisco.infra.browser.custom.ui/src/org/eclipse/gmt/modisco/infra/browser/custom/ui/controls/QuerySetsSelectionControl.java
index 3aee9cd..5ba1ac5 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom.ui/src/org/eclipse/gmt/modisco/infra/browser/custom/ui/controls/QuerySetsSelectionControl.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom.ui/src/org/eclipse/gmt/modisco/infra/browser/custom/ui/controls/QuerySetsSelectionControl.java
@@ -35,7 +35,12 @@
 import org.eclipse.swt.widgets.Composite;

 import org.eclipse.swt.widgets.Label;

 

-/** A control to select which query sets must be imported. */

+/**

+ * A control to select which query sets must be imported.

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

+ */

+@Deprecated

 public class QuerySetsSelectionControl extends Composite {

 

 	private static final String COMBO_ALL = Messages.QuerySetsSelectionControl_allExistingQuerySets;

diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.browser.custom/META-INF/MANIFEST.MF
index c975823..2d7f35a 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %Bundle-Name

 Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.browser.custom;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-ClassPath: .

 Bundle-Vendor: %Bundle-Vendor

 Bundle-Localization: plugin

diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/plugin.properties b/org.eclipse.gmt.modisco.infra.browser.custom/plugin.properties
index aa3df8b..a890e7a 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/plugin.properties
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/plugin.properties
@@ -8,11 +8,11 @@
 # Contributors:

 #     Nicolas Bros (Mia-Software) - initial API and implementation

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

-pluginName = MoDisco UiCustom Model

+pluginName = MoDisco UiCustom Model (Deprecated) (Incubation)

 providerName = Eclipse Modeling Project

 

 Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = MoDisco Browser customization metamodel (Incubation)

+Bundle-Name = MoDisco Browser customization metamodel (Deprecated) (Incubation)

 contraints.category.name = MoDisco Model Browser Customizations Constraints

 constraint.name = Non-Empty Names

 constraint.description = The item must be named.

diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/AttributeView.java b/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/AttributeView.java
index 07d5c7a..3ed8cd7 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/AttributeView.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/AttributeView.java
@@ -30,7 +30,10 @@
  * @see org.eclipse.gmt.modisco.infra.browser.custom.emf.UicustomPackage#getAttributeView()

  * @model

  * @generated

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

  */

+@Deprecated

 public interface AttributeView extends CustomView {

 	/**

 	 * Returns the value of the '<em><b>Attribute Name</b></em>' attribute.

diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/CustomView.java b/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/CustomView.java
index 27aaaeb..c597b6a 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/CustomView.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/CustomView.java
@@ -31,7 +31,10 @@
  * @see org.eclipse.gmt.modisco.infra.browser.custom.emf.UicustomPackage#getCustomView()

  * @model abstract="true"

  * @generated

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

  */

+@Deprecated

 public interface CustomView extends EObject {

 	/**

 	 * Returns the value of the '<em><b>Customized Features</b></em>' containment reference list.

diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/CustomViewFeature.java b/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/CustomViewFeature.java
index c61a526..cee87a0 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/CustomViewFeature.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/CustomViewFeature.java
@@ -34,7 +34,10 @@
  * @see org.eclipse.gmt.modisco.infra.browser.custom.emf.UicustomPackage#getCustomViewFeature()

  * @model

  * @generated

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

  */

+@Deprecated

 public interface CustomViewFeature extends EObject {

 	/**

 	 * Returns the value of the '<em><b>Customized Feature</b></em>' attribute.

diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/CustomizableFeatures.java b/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/CustomizableFeatures.java
index c5a5e14..56c8dcd 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/CustomizableFeatures.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/CustomizableFeatures.java
@@ -27,7 +27,10 @@
  * @see org.eclipse.gmt.modisco.infra.browser.custom.emf.UicustomPackage#getCustomizableFeatures()

  * @model

  * @generated

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

  */

+@Deprecated

 @SuppressWarnings("all")

 public enum CustomizableFeatures implements Enumerator {

 	/**

diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/DerivedFeatureValue.java b/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/DerivedFeatureValue.java
index 0f3dd74..0938ba0 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/DerivedFeatureValue.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/DerivedFeatureValue.java
@@ -31,7 +31,10 @@
  * @see org.eclipse.gmt.modisco.infra.browser.custom.emf.UicustomPackage#getDerivedFeatureValue()

  * @model

  * @generated

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

  */

+@Deprecated

 public interface DerivedFeatureValue extends FeatureValue {

 	/**

 	 * Returns the value of the '<em><b>Value Calculator</b></em>' reference.

diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/FeatureValue.java b/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/FeatureValue.java
index ed0b17a..4bc0486 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/FeatureValue.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/FeatureValue.java
@@ -31,7 +31,10 @@
  * @see org.eclipse.gmt.modisco.infra.browser.custom.emf.UicustomPackage#getFeatureValue()

  * @model abstract="true"

  * @generated

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

  */

+@Deprecated

 public interface FeatureValue extends EObject {

 	/**

 	 * Returns the value of the '<em><b>Feature</b></em>' container reference.

diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/FeatureValueCase.java b/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/FeatureValueCase.java
index 854394d..4ac1692 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/FeatureValueCase.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/FeatureValueCase.java
@@ -33,7 +33,10 @@
  * @see org.eclipse.gmt.modisco.infra.browser.custom.emf.UicustomPackage#getFeatureValueCase()

  * @model

  * @generated

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

  */

+@Deprecated

 public interface FeatureValueCase extends EObject {

 	/**

 	 * Returns the value of the '<em><b>Condition</b></em>' reference.

diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/MetamodelView.java b/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/MetamodelView.java
index 2d94f04..7efce28 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/MetamodelView.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/MetamodelView.java
@@ -35,7 +35,10 @@
  * @see org.eclipse.gmt.modisco.infra.browser.custom.emf.UicustomPackage#getMetamodelView()

  * @model

  * @generated

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

  */

+@Deprecated

 public interface MetamodelView extends EObject {

 	/**

 	 * Returns the value of the '<em><b>Name</b></em>' attribute. <!--

diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/ReferenceView.java b/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/ReferenceView.java
index f52d7dc..e8062a9 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/ReferenceView.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/ReferenceView.java
@@ -30,7 +30,10 @@
  * @see org.eclipse.gmt.modisco.infra.browser.custom.emf.UicustomPackage#getReferenceView()

  * @model

  * @generated

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

  */

+@Deprecated

 public interface ReferenceView extends CustomView {

 	/**

 	 * Returns the value of the '<em><b>Reference Name</b></em>' attribute.

diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/StaticFeatureValue.java b/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/StaticFeatureValue.java
index 66008c0..76ba300 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/StaticFeatureValue.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/StaticFeatureValue.java
@@ -29,7 +29,10 @@
  * @see org.eclipse.gmt.modisco.infra.browser.custom.emf.UicustomPackage#getStaticFeatureValue()

  * @model

  * @generated

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

  */

+@Deprecated

 public interface StaticFeatureValue extends FeatureValue {

 	/**

 	 * Returns the value of the '<em><b>Value</b></em>' attribute.

diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/TypeView.java b/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/TypeView.java
index ab67eba..3f6b8a8 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/TypeView.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/TypeView.java
@@ -34,7 +34,10 @@
  * @see org.eclipse.gmt.modisco.infra.browser.custom.emf.UicustomPackage#getTypeView()

  * @model

  * @generated

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

  */

+@Deprecated

 public interface TypeView extends CustomView {

 	/**

 	 * Returns the value of the '<em><b>Metaclass Name</b></em>' attribute.

diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/emf/UicustomFactory.java b/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/emf/UicustomFactory.java
index bf5b3d5..3f2127d 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/emf/UicustomFactory.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/emf/UicustomFactory.java
@@ -30,7 +30,10 @@
  * <!-- end-user-doc -->

  * @see org.eclipse.gmt.modisco.infra.browser.custom.emf.UicustomPackage

  * @generated

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

  */

+@Deprecated

 public interface UicustomFactory extends EFactory {

 	/**

 	 * The singleton instance of the factory.

diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/emf/UicustomPackage.java b/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/emf/UicustomPackage.java
index 3a7c8db..d71563e 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/emf/UicustomPackage.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/emf/UicustomPackage.java
@@ -33,7 +33,10 @@
  * @see org.eclipse.gmt.modisco.infra.browser.custom.emf.UicustomFactory

  * @model kind="package"

  * @generated

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

  */

+@Deprecated

 @SuppressWarnings("all")

 public interface UicustomPackage extends EPackage {

 	/**

diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/emf/util/UicustomAdapterFactory.java b/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/emf/util/UicustomAdapterFactory.java
index 78186ec..272a64e 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/emf/util/UicustomAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/emf/util/UicustomAdapterFactory.java
@@ -27,7 +27,10 @@
  * <!-- end-user-doc -->

  * @see org.eclipse.gmt.modisco.infra.browser.custom.emf.UicustomPackage

  * @generated

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

  */

+@Deprecated

 @SuppressWarnings("all")

 public class UicustomAdapterFactory extends AdapterFactoryImpl {

 	/**

diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/emf/util/UicustomSwitch.java b/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/emf/util/UicustomSwitch.java
index 3a5a469..5e74b4b 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/emf/util/UicustomSwitch.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/emf/util/UicustomSwitch.java
@@ -32,7 +32,10 @@
  * <!-- end-user-doc -->

  * @see org.eclipse.gmt.modisco.infra.browser.custom.emf.UicustomPackage

  * @generated

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

  */

+@Deprecated

 @SuppressWarnings("all")

 public class UicustomSwitch<T> {

 	/**

diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/util/OverlayIconInfo.java b/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/util/OverlayIconInfo.java
index af233a4..e3830c9 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/util/OverlayIconInfo.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/util/OverlayIconInfo.java
@@ -10,6 +10,11 @@
  *******************************************************************************/

 package org.eclipse.gmt.modisco.infra.browser.custom.util;

 

+/**

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

+ */

+@Deprecated

 public class OverlayIconInfo {

 	private final OverlayIconPosition iconPosition;

 	private final String path;

diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/util/OverlayIconPosition.java b/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/util/OverlayIconPosition.java
index 721e4bf..3bb960e 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/util/OverlayIconPosition.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/util/OverlayIconPosition.java
@@ -10,6 +10,11 @@
  *******************************************************************************/

 package org.eclipse.gmt.modisco.infra.browser.custom.util;

 

+/**

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

+ */

+@Deprecated

 public enum OverlayIconPosition {

 	TopLeft, TopMiddle, TopRight, BottomLeft, BottomMiddle, BottomRight

 }

diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/util/UicustomUtil.java b/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/util/UicustomUtil.java
index 7c15d1e..9811dcf 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/util/UicustomUtil.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/util/UicustomUtil.java
@@ -19,6 +19,11 @@
 import org.eclipse.gmt.modisco.infra.browser.custom.FeatureValueCase;

 import org.eclipse.swt.graphics.RGB;

 

+/**

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

+ */

+@Deprecated

 public final class UicustomUtil {

 

 	private static final int MAX_COLOR_INTENSITY = 255;

diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/validation/EValidatorAdapter.java b/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/validation/EValidatorAdapter.java
index c4235ea..51cb992 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/validation/EValidatorAdapter.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/validation/EValidatorAdapter.java
@@ -28,7 +28,10 @@
 /**

  * An adapter that plugs the EMF Model Validation Service API into the

  * {@link org.eclipse.emf.ecore.EValidator} API.

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

  */

+@Deprecated

 public class EValidatorAdapter extends EObjectValidator {

 

 	/**

diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/validation/ValidationDelegateClientSelector.java b/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/validation/ValidationDelegateClientSelector.java
index 7490fcd..d13a7fb 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/validation/ValidationDelegateClientSelector.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/validation/ValidationDelegateClientSelector.java
@@ -12,6 +12,11 @@
 

 import org.eclipse.emf.validation.model.IClientSelector;

 

+/**

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

+ */

+@Deprecated

 public class ValidationDelegateClientSelector implements IClientSelector {

 	public boolean selects(final Object object) {

 		return true;

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf/META-INF/MANIFEST.MF
index 92f20cf..790820e 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf/OSGI-INF/l10n/bundle.properties b/org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf/OSGI-INF/l10n/bundle.properties
index f71bb85..ff77545 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf/OSGI-INF/l10n/bundle.properties
@@ -1,4 +1,4 @@
 #Properties file for org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf

-Bundle-Name = MoDisco Browser CNF Example (Incubation)

+Bundle-Name = MoDisco Browser CNF Example (Deprecated) (Incubation)

 Bundle-Vendor = Eclipse Modeling Project

-navigatorContent.name = Model Contents
\ No newline at end of file
+navigatorContent.name = Model Contents (Deprecated)
\ No newline at end of file
diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf/src/org/eclipse/gmt/modisco/infra/browser/uicore/examples/cnf/Activator.java b/org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf/src/org/eclipse/gmt/modisco/infra/browser/uicore/examples/cnf/Activator.java
index 8dfa07e..f583a8f 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf/src/org/eclipse/gmt/modisco/infra/browser/uicore/examples/cnf/Activator.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf/src/org/eclipse/gmt/modisco/infra/browser/uicore/examples/cnf/Activator.java
@@ -22,7 +22,10 @@
 

 /**

  * The activator class controls the plug-in life cycle

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

  */

+@Deprecated

 public class Activator extends AbstractUIPlugin {

 

 	// The plug-in ID

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf/src/org/eclipse/gmt/modisco/infra/browser/uicore/examples/cnf/LinkHelper.java b/org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf/src/org/eclipse/gmt/modisco/infra/browser/uicore/examples/cnf/LinkHelper.java
index 4289a50..d2e88c9 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf/src/org/eclipse/gmt/modisco/infra/browser/uicore/examples/cnf/LinkHelper.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf/src/org/eclipse/gmt/modisco/infra/browser/uicore/examples/cnf/LinkHelper.java
@@ -30,6 +30,11 @@
 import org.eclipse.ui.IWorkbenchPage;

 import org.eclipse.ui.navigator.ILinkHelper;

 

+/**

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

+ */

+@Deprecated

 public class LinkHelper implements ILinkHelper {

 

 	public IStructuredSelection findSelection(final IEditorInput anInput) {

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf/src/org/eclipse/gmt/modisco/infra/browser/uicore/examples/cnf/MoDiscoContentProvider.java b/org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf/src/org/eclipse/gmt/modisco/infra/browser/uicore/examples/cnf/MoDiscoContentProvider.java
index ea6c8fa..a29483c 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf/src/org/eclipse/gmt/modisco/infra/browser/uicore/examples/cnf/MoDiscoContentProvider.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf/src/org/eclipse/gmt/modisco/infra/browser/uicore/examples/cnf/MoDiscoContentProvider.java
@@ -18,6 +18,11 @@
 import org.eclipse.ui.PlatformUI;

 import org.eclipse.ui.navigator.resources.ProjectExplorer;

 

+/**

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

+ */

+@Deprecated

 public class MoDiscoContentProvider extends CustomizableModelContentProvider {

 

 	public MoDiscoContentProvider() {

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf/src/org/eclipse/gmt/modisco/infra/browser/uicore/examples/cnf/MoDiscoLabelProvider.java b/org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf/src/org/eclipse/gmt/modisco/infra/browser/uicore/examples/cnf/MoDiscoLabelProvider.java
index eb74ff9..51396de 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf/src/org/eclipse/gmt/modisco/infra/browser/uicore/examples/cnf/MoDiscoLabelProvider.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf/src/org/eclipse/gmt/modisco/infra/browser/uicore/examples/cnf/MoDiscoLabelProvider.java
@@ -12,6 +12,11 @@
 

 import org.eclipse.gmt.modisco.infra.browser.uicore.CustomizableModelLabelProvider;

 

+/**

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

+ */

+@Deprecated

 public class MoDiscoLabelProvider extends CustomizableModelLabelProvider {

 	public MoDiscoLabelProvider() {

 		super(Activator.getDefault().getCustomizationManager());

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf/src/org/eclipse/gmt/modisco/infra/browser/uicore/examples/cnf/actions/OpenAction.java b/org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf/src/org/eclipse/gmt/modisco/infra/browser/uicore/examples/cnf/actions/OpenAction.java
index 9917296..db5747d 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf/src/org/eclipse/gmt/modisco/infra/browser/uicore/examples/cnf/actions/OpenAction.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf/src/org/eclipse/gmt/modisco/infra/browser/uicore/examples/cnf/actions/OpenAction.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2010 Mia-Software.

+ * Copyright (c) 2010, 2015 Mia-Software.

  * 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

@@ -7,6 +7,7 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

+ *    Grégoire Dupé (Mia-Software) - Bug 472203 - NullPointerException in ResourceEditorInput.getName (41)

  *******************************************************************************/

 package org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf.actions;

 

@@ -27,6 +28,11 @@
 import org.eclipse.ui.PartInitException;

 import org.eclipse.ui.ide.IDE;

 

+/**

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

+ */

+@Deprecated

 public class OpenAction extends Action {

 

 	private final IWorkbenchPage page;

@@ -61,7 +67,7 @@
 				Object firstElement = sSelection.getFirstElement();

 				EObject eObject = (EObject) Platform.getAdapterManager().getAdapter(firstElement,

 						EObject.class);

-				if (eObject != null) {

+				if (eObject != null && eObject.eResource() != null) {

 					this.target = eObject;

 					return true;

 				}

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf/src/org/eclipse/gmt/modisco/infra/browser/uicore/examples/cnf/actions/OpenProvider.java b/org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf/src/org/eclipse/gmt/modisco/infra/browser/uicore/examples/cnf/actions/OpenProvider.java
index 74eea65..89bfdf1 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf/src/org/eclipse/gmt/modisco/infra/browser/uicore/examples/cnf/actions/OpenProvider.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf/src/org/eclipse/gmt/modisco/infra/browser/uicore/examples/cnf/actions/OpenProvider.java
@@ -19,6 +19,11 @@
 import org.eclipse.ui.navigator.ICommonViewerSite;

 import org.eclipse.ui.navigator.ICommonViewerWorkbenchSite;

 

+/**

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

+ */

+@Deprecated

 public class OpenProvider extends CommonActionProvider {

 

 	private OpenAction openAction;

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.browser.uicore/META-INF/MANIFEST.MF
index ab7e1f6..89b162f 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.browser.uicore;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.gmt.modisco.infra.browser.uicore.internal.Activator
 Bundle-Vendor: %Bundle-Vendor
diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/plugin.properties b/org.eclipse.gmt.modisco.infra.browser.uicore/plugin.properties
index 8bbe9b5..cfee757 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/plugin.properties
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/plugin.properties
@@ -11,4 +11,4 @@
 # NLS_MESSAGEFORMAT_VAR
 
 Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = MoDisco Model Browser UI Core (Incubation)

+Bundle-Name = MoDisco Model Browser UI Core (Deprecated) (Incubation)

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/ChangeListener.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/ChangeListener.java
index 15b1cd3..12d7790 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/ChangeListener.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/ChangeListener.java
@@ -12,7 +12,12 @@
 

 import java.util.EventListener;

 

-/** A listener for change notifications */

+/**

+ * A listener for change notifications

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

+ */

+@Deprecated

 public interface ChangeListener extends EventListener {

 	void changed();

 }
\ No newline at end of file
diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/CustomizableModelContentProvider.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/CustomizableModelContentProvider.java
index 58ffaff..9f30442 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/CustomizableModelContentProvider.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/CustomizableModelContentProvider.java
@@ -26,7 +26,12 @@
 import org.eclipse.jface.viewers.ITreeContentProvider;

 import org.eclipse.jface.viewers.Viewer;

 

-/** A tree content provider used to display a model customized with a MoDico customization. */

+/**

+ * A tree content provider used to display a model customized with a MoDico customization.

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

+ */

+@Deprecated

 public class CustomizableModelContentProvider implements ITreeContentProvider {

 

 	private final AppearanceConfiguration appearanceConfiguration;

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/CustomizableModelLabelProvider.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/CustomizableModelLabelProvider.java
index 6ca452d..0dc3922 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/CustomizableModelLabelProvider.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/CustomizableModelLabelProvider.java
@@ -19,7 +19,12 @@
 import org.eclipse.swt.graphics.Font;

 import org.eclipse.swt.graphics.Image;

 

-/** A label provider used to display a model customized with a MoDico customization. */

+/**

+ * A label provider used to display a model customized with a MoDico customization.

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

+ */

+@Deprecated

 public class CustomizableModelLabelProvider extends LabelProvider implements IColorProvider,

 		IFontProvider {

 	

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/CustomizationManager.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/CustomizationManager.java
index af58556..307c55a 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/CustomizationManager.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/CustomizationManager.java
@@ -32,7 +32,10 @@
  * <p>

  * Note that you must call {@link CustomizationManager#installCustomPainter(Tree)

  * installCustomPainter} for all customizations to be displayed properly.

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

  */

+@Deprecated

 public class CustomizationManager {

 	private final AppearanceConfiguration appearanceConfiguration;

 

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/Message.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/Message.java
index 76afb26..eb592ef 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/Message.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/Message.java
@@ -23,7 +23,10 @@
 /**

  * A message that appears instead of model elements, for example when the list is empty or the input

  * is <code>null</code>.

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

  */

+@Deprecated

 public class Message implements ITreeElement {

 	private final String message;

 

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/UnwrappingSelectionProvider.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/UnwrappingSelectionProvider.java
index 4d015db..4cc9bfb 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/UnwrappingSelectionProvider.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/UnwrappingSelectionProvider.java
@@ -43,9 +43,10 @@
  * getSite().registerContextMenu(MENU_ID, contextMenu, new UnwrappingSelectionProvider(treeViewer));
  * </pre>
  * 
- * 
- * 
+ * @deprecated Will be replaced by EMF Facet,
+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715
  */
+@Deprecated
 public class UnwrappingSelectionProvider extends
 		org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider {
 
diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/extensions/icons/FilteredIconProvider.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/extensions/icons/FilteredIconProvider.java
index 5d8e44c..8d4c9db 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/extensions/icons/FilteredIconProvider.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/extensions/icons/FilteredIconProvider.java
@@ -16,7 +16,10 @@
  * An extension to {@link IconProvider} that adds a way to filter elements

  * before the {@link IconProvider#getIcon(org.eclipse.emf.ecore.EObject)

  * getName} method is called.

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

  */

+@Deprecated

 public interface FilteredIconProvider extends IconProvider {

 	/** @return whether this {@link IconProvider} filters the given metaclass */

 	boolean filter(String metaclass);

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/extensions/icons/IconProvider.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/extensions/icons/IconProvider.java
index 811049d..233e984 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/extensions/icons/IconProvider.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/extensions/icons/IconProvider.java
@@ -19,7 +19,10 @@
  * The interface that must be implemented in order to use the "icons" extension.

  * Implementors may choose to use the {@link FilteredIconProvider} interface

  * instead if they want to add a filter.

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

  */

+@Deprecated

 public interface IconProvider {

 

 	/**

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/extensions/naming/AbstractNameProvider.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/extensions/naming/AbstractNameProvider.java
index cffb9e3..c7b2bd2 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/extensions/naming/AbstractNameProvider.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/extensions/naming/AbstractNameProvider.java
@@ -23,7 +23,10 @@
  * naming extension. It provides the

  * {@link AbstractNameProvider#getDefaultName(EObject) getDefaultName} method,

  * which finds a default name (which can be empty) for any model element.

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

  */

+@Deprecated

 public abstract class AbstractNameProvider implements NameProvider {

 

 	/**

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/extensions/naming/FilteredNameProvider.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/extensions/naming/FilteredNameProvider.java
index 1f82295..1108f45 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/extensions/naming/FilteredNameProvider.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/extensions/naming/FilteredNameProvider.java
@@ -16,7 +16,10 @@
  * An extension to {@link NameProvider} that adds a way to filter elements

  * before the {@link NameProvider#getName(org.eclipse.emf.ecore.EObject)

  * getName} method is called.

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

  */

+@Deprecated

 public interface FilteredNameProvider extends NameProvider {

 	/** @return whether this {@link NameProvider} filters the given metaclass */

 	boolean filter(String metaclass);

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/extensions/naming/NameProvider.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/extensions/naming/NameProvider.java
index 2ff666a..9cbb247 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/extensions/naming/NameProvider.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/extensions/naming/NameProvider.java
@@ -19,7 +19,10 @@
  * Implementors may choose to use the {@link FilteredNameProvider} interface

  * instead if they want to add a filter, or the {@link AbstractNameProvider}

  * class, which implements default naming rules.

- * */

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

+ */

+@Deprecated

 public interface NameProvider {

 

 	/**

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/Activator.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/Activator.java
index db7082d..106b624 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/Activator.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/Activator.java
@@ -13,7 +13,12 @@
 import org.eclipse.ui.plugin.AbstractUIPlugin;

 import org.osgi.framework.BundleContext;

 

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

+/**

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

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

+ */

+@Deprecated

 public class Activator extends AbstractUIPlugin {

 

 	/** The plug-in ID */

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/AppearanceConfiguration.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/AppearanceConfiguration.java
index 6afd629..9e213f7 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/AppearanceConfiguration.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/AppearanceConfiguration.java
@@ -40,7 +40,10 @@
  * <li>access to the {@link CustomizationEngine}, used to customize the appearance of model elements

  * both statically and dynamically

  * </ul>

- * */

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

+ */

+@Deprecated

 public class AppearanceConfiguration {

 

 	public enum MetaclassesSortMode {

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/CustomTreePainter.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/CustomTreePainter.java
index 56c7f5a..147e700 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/CustomTreePainter.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/CustomTreePainter.java
@@ -49,7 +49,10 @@
  * <li>Displays "stickers" for Facets on the right of model elements that carry one or more facet(s)

  * for which an icon has been provided through a customization (uiCustom file)

  * </ul>

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

  */

+@Deprecated

 public class CustomTreePainter {

 

 	private static final int MAX_ALPHA = 255;

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/Messages.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/Messages.java
index 7eab31a..f9fe41d 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/Messages.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/Messages.java
@@ -13,6 +13,11 @@
 

 import org.eclipse.osgi.util.NLS;

 

+/**

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

+ */

+@Deprecated

 public final class Messages extends NLS {

 	private static final String BUNDLE_NAME = "org.eclipse.gmt.modisco.infra.browser.uicore.internal.messages"; //$NON-NLS-1$

 

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/adapters/AdapterFactory.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/adapters/AdapterFactory.java
index b76cd20..0023aaa 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/adapters/AdapterFactory.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/adapters/AdapterFactory.java
@@ -17,7 +17,10 @@
 /**

  * An Eclipse adapter factory used to adapt a {@link ModelElementItem} to the {@link EObject} it

  * represents.

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

  */

+@Deprecated

 public class AdapterFactory implements IAdapterFactory {

 

 	@SuppressWarnings("unchecked")

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/adapters/ElementID.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/adapters/ElementID.java
index 94b8e18..e99ef8a 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/adapters/ElementID.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/adapters/ElementID.java
@@ -10,7 +10,12 @@
  *******************************************************************************/

 package org.eclipse.gmt.modisco.infra.browser.uicore.internal.adapters;

 

-/** Used to associate an id to an element */

+/**

+ * Used to associate an id to an element

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

+ */

+@Deprecated

 public interface ElementID {

 	long getID();

 }

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/adapters/ElementIDAdapter.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/adapters/ElementIDAdapter.java
index bf8d766..d1ffacf 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/adapters/ElementIDAdapter.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/adapters/ElementIDAdapter.java
@@ -14,7 +14,10 @@
 

 /**

  * Associates a unique integer with each model element (lazily, when the adapter is created)

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

  */

+@Deprecated

 public class ElementIDAdapter extends AdapterImpl implements ElementID {

 

 	private static long lastID = 0;

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/adapters/ElementIDAdapterFactory.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/adapters/ElementIDAdapterFactory.java
index c922886..5e221fd 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/adapters/ElementIDAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/adapters/ElementIDAdapterFactory.java
@@ -19,7 +19,10 @@
 /**

  * An EMF adapter factory used to instantiate {@link ElementIDAdapter}, that is used to associate an

  * id to an {@link EObject}.

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

  */

+@Deprecated

 public final class ElementIDAdapterFactory extends AdapterFactoryImpl {

 

 	private static final AdapterFactory INSTANCE = new ElementIDAdapterFactory();

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/customization/CustomizationEngine.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/customization/CustomizationEngine.java
index 63ec954..9aec079 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/customization/CustomizationEngine.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/customization/CustomizationEngine.java
@@ -85,7 +85,10 @@
  * access, and the "apply to sub-instances" option on metaclasses

  * <li>images, colors and fonts are decoded once and then kept in cache

  * </ul>

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

  */

+@Deprecated

 public class CustomizationEngine {

 

 	private final Map<EClass, EngineElementView> engineTypeViews = new HashMap<EClass, EngineElementView>();

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/customization/OverlayIconImageInfo.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/customization/OverlayIconImageInfo.java
index 757eff3..fa0e21f 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/customization/OverlayIconImageInfo.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/customization/OverlayIconImageInfo.java
@@ -17,7 +17,10 @@
  * Represents an overlay icon positioned over the man icon of an element in a tree widget. The icon

  * can have a different position depending on the value of the given {@link OverlayIconPosition}

  * instance.

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

  */

+@Deprecated

 public class OverlayIconImageInfo {

 	private final OverlayIconPosition iconPosition;

 	private final Image image;

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/extensions/IconProvidersRegistry.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/extensions/IconProvidersRegistry.java
index 6bb7849..d28c3b4 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/extensions/IconProvidersRegistry.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/extensions/IconProvidersRegistry.java
@@ -37,7 +37,10 @@
  * reading extensions when first accessed. It can provide names for model

  * elements, using {@link IconProvider}s provided through the naming extension

  * point.

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

  */

+@Deprecated

 public class IconProvidersRegistry extends AbstractRegistry {

 

 	private static final String METACLASS_ELEMENT = "metaclass"; //$NON-NLS-1$

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/extensions/NameProvidersRegistry.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/extensions/NameProvidersRegistry.java
index 343103a..0c11fc8 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/extensions/NameProvidersRegistry.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/extensions/NameProvidersRegistry.java
@@ -36,7 +36,10 @@
  * reading extensions when first accessed. It can provide names for model

  * elements, using {@link NameProvider}s provided through the naming extension

  * point.

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

  */

+@Deprecated

 public class NameProvidersRegistry extends AbstractRegistry {

 

 	private static final String METACLASS_ELEMENT = "metaclass"; //$NON-NLS-1$

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/AttributeItem.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/AttributeItem.java
index 5c1d3d6..17e51d4 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/AttributeItem.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/AttributeItem.java
@@ -34,7 +34,10 @@
 

 /**

  * An item for displaying attributes ({@link EAttribute}) of a model element as elements in the tree.

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

  */

+@Deprecated

 public class AttributeItem implements ITreeElement, IAdaptable {

 

 	/** The attribute */

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/BigListItem.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/BigListItem.java
index 4f89243..6af7b5d 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/BigListItem.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/BigListItem.java
@@ -41,7 +41,10 @@
  * An item which is displayed as a range when splitting big element lists into smaller ones.

  * <p>

  * This is done so as to avoid locking the GUI for too long when the tree is built

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

  */

+@Deprecated

 public class BigListItem implements ITreeElement {

 

 	/**

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/ContainerLink.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/ContainerLink.java
index 970f5fa..83d4de4 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/ContainerLink.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/ContainerLink.java
@@ -25,7 +25,12 @@
 import org.eclipse.swt.graphics.Font;

 import org.eclipse.swt.graphics.Image;

 

-/** A link to the EMF container of an element ({@link EObject#eContainer()}) */

+/**

+ * A link to the EMF container of an element ({@link EObject#eContainer()})

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

+ */

+@Deprecated

 public class ContainerLink implements ITreeElement {

 

 	/** The model element that appears as the parent of the link in the tree */

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/ITreeElement.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/ITreeElement.java
index 34a9eab..2b91e5d 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/ITreeElement.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/ITreeElement.java
@@ -18,7 +18,12 @@
 import org.eclipse.swt.graphics.Font;

 import org.eclipse.swt.graphics.Image;

 

-/** The base interface implemented by all elements that appear in the browser */

+/**

+ * The base interface implemented by all elements that appear in the browser

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

+ */

+@Deprecated

 public interface ITreeElement {

 	String getText();

 

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/ItemsFactory.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/ItemsFactory.java
index 42bdb8a..917a7cd 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/ItemsFactory.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/ItemsFactory.java
@@ -17,7 +17,10 @@
 /**

  * A factory that creates tree items. This allows extending these elements by

  * extending the factory and returning extended versions of the elements.

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

  */

+@Deprecated

 public class ItemsFactory {

 	public ModelElementItem createModelElementItem(final EObject eObject,

 			final ITreeElement treeParent, final AppearanceConfiguration appearanceConfiguration) {

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/LinkItem.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/LinkItem.java
index 8e138af..9a79050 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/LinkItem.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/LinkItem.java
@@ -35,7 +35,12 @@
 import org.eclipse.swt.graphics.Font;

 import org.eclipse.swt.graphics.Image;

 

-/** A link (representing an {@link EReference}) between two model elements in the tree. */

+/**

+ * A link (representing an {@link EReference}) between two model elements in the tree.

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

+ */

+@Deprecated

 public class LinkItem implements ITreeElement, IAdaptable {

 

 	/** The reference corresponding to the link */

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/ModelElementItem.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/ModelElementItem.java
index 56bcf50..4fe2672 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/ModelElementItem.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/ModelElementItem.java
@@ -55,7 +55,12 @@
 import org.eclipse.swt.graphics.Font;

 import org.eclipse.swt.graphics.Image;

 

-/** Represents a model element ({@link EObject}). Uses reflection on the Ecore metamodel. */

+/**

+ * Represents a model element ({@link EObject}). Uses reflection on the Ecore metamodel.

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

+ */

+@Deprecated

 public class ModelElementItem implements ITreeElement, IAdaptable {

 

 	/** The configuration of the way elements are displayed */

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/OperationCanceledException.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/OperationCanceledException.java
index d3b3b37..a97742c 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/OperationCanceledException.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/OperationCanceledException.java
@@ -12,7 +12,12 @@
 

 package org.eclipse.gmt.modisco.infra.browser.uicore.internal.model;

 

-/** An exception thrown when the user cancels an operation */

+/**

+ * An exception thrown when the user cancels an operation

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

+ */

+@Deprecated

 public class OperationCanceledException extends RuntimeException {

 	private static final long serialVersionUID = -7431558914173714537L;

 }
\ No newline at end of file
diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/URIAttribute.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/URIAttribute.java
index f3f86e4..81d959f 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/URIAttribute.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/URIAttribute.java
@@ -24,7 +24,12 @@
 import org.eclipse.swt.graphics.Font;

 import org.eclipse.swt.graphics.Image;

 

-/** A virtual attribute used to display the URI of an {@link EObject} */

+/**

+ * A virtual attribute used to display the URI of an {@link EObject}

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

+ */

+@Deprecated

 public class URIAttribute implements ITreeElement {

 

 	/**

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/util/ColorProvider.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/util/ColorProvider.java
index 3ab2340..27e252f 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/util/ColorProvider.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/util/ColorProvider.java
@@ -20,7 +20,10 @@
 /**

  * Returns SWT {@link Color}s used in the model browser, and caches them to optimize system

  * resources usage.

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

  */

+@Deprecated

 public final class ColorProvider {

 

 	private static ColorProvider instance;

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/util/EMFUtil.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/util/EMFUtil.java
index a842632..26540eb 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/util/EMFUtil.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/util/EMFUtil.java
@@ -34,7 +34,12 @@
 import org.eclipse.gmt.modisco.infra.common.core.internal.utils.ModelUtils;

 import org.eclipse.gmt.modisco.infra.common.core.logging.MoDiscoLogger;

 

-/** Utility functions related to EMF */

+/**

+ * Utility functions related to EMF

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

+ */

+@Deprecated

 public class EMFUtil {

 

 	/**

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/util/ImageProvider.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/util/ImageProvider.java
index 29354a0..ac84cfb 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/util/ImageProvider.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/util/ImageProvider.java
@@ -21,7 +21,12 @@
 import org.eclipse.osgi.util.NLS;

 import org.eclipse.swt.graphics.Image;

 

-/** A singleton image provider, which caches image descriptors */

+/**

+ * A singleton image provider, which caches image descriptors

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

+ */

+@Deprecated

 public final class ImageProvider {

 

 	private ImageProvider() {

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/util/QueryErrorDialog.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/util/QueryErrorDialog.java
index fc07f6b..9cb87e4 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/util/QueryErrorDialog.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/util/QueryErrorDialog.java
@@ -25,7 +25,10 @@
 /**

  * A dialog used to display query errors, that contains a checkbox to let the user prevent the

  * dialog from displaying again during the current session.

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

  */

+@Deprecated

 public class QueryErrorDialog extends MessageDialog {

 

 	private Button cbDontShowAnymore;

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/util/QueryUtil.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/util/QueryUtil.java
index b796b9c..f1e2e89 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/util/QueryUtil.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/util/QueryUtil.java
@@ -32,7 +32,12 @@
 import org.eclipse.osgi.util.NLS;

 import org.eclipse.swt.widgets.Display;

 

-/** Utility methods to evaluate MoDisco queries. */

+/**

+ * Utility methods to evaluate MoDisco queries.

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

+ */

+@Deprecated

 public final class QueryUtil {

 

 	private static final int MESSAGE_DELAY = 100;

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/util/Util.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/util/Util.java
index 6a212fa..76163ce 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/util/Util.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/util/Util.java
@@ -13,7 +13,12 @@
 import org.eclipse.core.resources.IFile;

 import org.eclipse.core.runtime.Path;

 

-/** General utility functions */

+/**

+ * General utility functions

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

+ */

+@Deprecated

 public final class Util {

 

 	private Util() {

diff --git a/org.eclipse.gmt.modisco.infra.browser/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.browser/META-INF/MANIFEST.MF
index 46729b1..849979a 100644
--- a/org.eclipse.gmt.modisco.infra.browser/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.browser/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %Bundle-Name

 Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.browser;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-ClassPath: .

 Bundle-Activator: org.eclipse.gmt.modisco.infra.browser.MoDiscoBrowserPlugin$Implementation

 Bundle-Vendor: %Bundle-Vendor

@@ -36,7 +36,8 @@
  org.eclipse.gmt.modisco.infra.browser.uicore;bundle-version="0.8.0",

  org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.0",

  org.eclipse.emf.facet.util.emf.ui;bundle-version="0.1.0",

- org.eclipse.emf.facet.util.emf.core;bundle-version="0.1.0"

+ org.eclipse.emf.facet.util.emf.core;bundle-version="0.1.0",

+ org.eclipse.emf.facet.util.core;bundle-version="1.0.0"

 Eclipse-LazyStart: true

 Bundle-ActivationPolicy: lazy

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/org.eclipse.gmt.modisco.infra.browser/plugin.properties b/org.eclipse.gmt.modisco.infra.browser/plugin.properties
index 0ca3e13..d8731cb 100644
--- a/org.eclipse.gmt.modisco.infra.browser/plugin.properties
+++ b/org.eclipse.gmt.modisco.infra.browser/plugin.properties
@@ -17,7 +17,7 @@
 OpenModelFromEmfRegistry_Tooltip=Open a model from the EMF EPackage registry

 ActionSet=Modisco Model Browser Actions

 Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = MoDisco Generic Model Browser (Incubation)

+Bundle-Name = MoDisco Generic Model Browser (Deprecated) (Incubation)

 NamingExtensionPoint = Naming of metamodel instances

 IconExtensionPoint = Icons for metaclasses

 OpenResourceInMoDiscoBrowserAction = Open Selected Resource In MoDisco Browser

diff --git a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/EcoreBrowser.java b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/EcoreBrowser.java
index c077d48..5e1436d 100644
--- a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/EcoreBrowser.java
+++ b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/EcoreBrowser.java
@@ -10,7 +10,8 @@
  *    Nicolas Payneau (Mia-Software) - Enable editability

  *    Nicolas Guyomar (Mia-Software) - Code Synchronization

  *    Nicolas Guyomar (Mia_software) - Bug 333651 Remove of the MoDisco EPackage view and of the metamodel browsing button

- *    Gregoire Dupe (Mia-Software) - Bug 404263 - EditingDomainProvider does not work when using IResourceEditorInput 

+ *    Gregoire Dupe (Mia-Software) - Bug 404263 - EditingDomainProvider does not work when using IResourceEditorInput

+ *    Gregoire Dupe (Mia-Software) - Bug 472182 - Missing debug information in EcoreBrowser.handleChangedResources(2636)

  *******************************************************************************/

 package org.eclipse.gmt.modisco.infra.browser.editors;

 

@@ -96,6 +97,7 @@
 import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;

 import org.eclipse.emf.edit.ui.util.EditUIUtil;

 import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;

+import org.eclipse.emf.facet.util.core.Logger;

 import org.eclipse.gmt.modisco.infra.browser.Messages;

 import org.eclipse.gmt.modisco.infra.browser.MoDiscoBrowserPlugin;

 import org.eclipse.gmt.modisco.infra.browser.actions.LoadFacetsAction;

@@ -2635,9 +2637,19 @@
 					try {

 						resource.load(Collections.EMPTY_MAP);

 					} catch (IOException e) {

-						MoDiscoLogger.logError(e, MoDiscoBrowserPlugin.getPlugin());

+						final URI uri = resource.getURI();

+						final String uristr = uri.toString();

+						final String logMsg = String.format(

+								"The MoDisco browser failed to reload the resource %s.", //$NON-NLS-1$

+								uristr);

+						Logger.logError(

+								e, logMsg , MoDiscoBrowserPlugin.getPlugin());

+						final String userMsg = String.format(

+								"%s, cf. %s", //$NON-NLS-1$

+								Messages.EcoreBrowser_errorLoadingResource,

+								uristr);

 						DialogUtils.openErrorDialog(getSite().getShell(), e,

-								Messages.EcoreBrowser_errorLoadingResource);

+								userMsg);

 						if (!this.resourceToDiagnosticMap.containsKey(resource)) {

 							this.resourceToDiagnosticMap.put(resource,

 									analyzeResourceProblems(resource, e));

diff --git a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/extensions/listeners/DoubleClickListener.java b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/extensions/listeners/DoubleClickListener.java
index 20edbb6..31cceee 100644
--- a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/extensions/listeners/DoubleClickListener.java
+++ b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/extensions/listeners/DoubleClickListener.java
@@ -13,6 +13,11 @@
 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.jface.action.IStatusLineManager;

 

+/**

+ * @deprecated Will be replaced by EMF Facet,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715

+ */

+@Deprecated

 public interface DoubleClickListener {

 

 	public abstract void synchronizeEObject(EObject eObjet, IStatusLineManager statusLineManager);

diff --git a/org.eclipse.gmt.modisco.infra.capabilities/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.capabilities/META-INF/MANIFEST.MF
index 4838977..d1da7cd 100644
--- a/org.eclipse.gmt.modisco.infra.capabilities/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.capabilities/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.capabilities;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Vendor: %Bundle-Vendor
diff --git a/org.eclipse.gmt.modisco.infra.common.cdo.derby/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.common.cdo.derby/META-INF/MANIFEST.MF
index f851f08..783ac72 100644
--- a/org.eclipse.gmt.modisco.infra.common.cdo.derby/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.common.cdo.derby/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.common.cdo.derby;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.gmt.modisco.infra.common.cdo.derby.internal.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.gmt.modisco.infra.common.cdo/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.common.cdo/META-INF/MANIFEST.MF
index e918026..d42509a 100644
--- a/org.eclipse.gmt.modisco.infra.common.cdo/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.common.cdo/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.common.cdo;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.gmt.modisco.infra.common.cdo.internal.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.gmt.modisco.infra.common.core/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.common.core/META-INF/MANIFEST.MF
index 19d1fb4..76b581a 100644
--- a/org.eclipse.gmt.modisco.infra.common.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.common.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.common.core;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/utils/FileUtils.java b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/utils/FileUtils.java
index c3d09fd..b8e2816 100644
--- a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/utils/FileUtils.java
+++ b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/utils/FileUtils.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2008, 2011 Mia-Software.

+ * Copyright (c) 2008, 2015 Mia-Software.

  * 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

@@ -7,6 +7,7 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

+ *    Grégoire Dupé (Mia-Software) - Bug 470578 - [Depercated] org.eclipse.gmt.modisco.infra.query 

  *******************************************************************************/

 package org.eclipse.gmt.modisco.infra.common.core.internal.utils;

 

@@ -166,9 +167,14 @@
 	}

 

 	public static void checkNoMarkerOn(final IFile file) throws CoreException {

+		checkNoMoreMarkerOn(file, 0);

+	}

+

+	public static void checkNoMoreMarkerOn(final IFile file, final int nbMarkers)

+			throws CoreException {

 		IMarker[] markers = null;

 		markers = file.findMarkers(IMarker.PROBLEM, true, IResource.DEPTH_INFINITE);

-		if (markers.length != 0) {

+		if (markers.length > nbMarkers) {

 			MultiStatus multiStatus = new MultiStatus(CommonModiscoActivator.PLUGIN_ID, 0,

 					"Markers found on: " //$NON-NLS-1$

 							+ file, new Exception());

diff --git a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/utils/ProjectUtils.java b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/utils/ProjectUtils.java
index cde9d4e..8007278 100644
--- a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/utils/ProjectUtils.java
+++ b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/utils/ProjectUtils.java
@@ -17,6 +17,7 @@
 import java.io.File;

 import java.io.IOException;

 import java.io.InputStream;

+import java.net.URL;

 import java.util.ArrayList;

 import java.util.Arrays;

 import java.util.Enumeration;

@@ -58,6 +59,7 @@
 import org.eclipse.jdt.core.JavaCore;

 import org.eclipse.jdt.core.JavaModelException;

 import org.eclipse.jdt.launching.JavaRuntime;

+import org.eclipse.osgi.service.datalocation.Location;

 import org.osgi.framework.Bundle;

 

 import com.ibm.icu.lang.UCharacter;

@@ -286,8 +288,20 @@
 		project.open(new NullProgressMonitor());

 		ZipFile zip = null;

 		try {

-			String bundlePath = bundle.getLocation();

-			String filePath = bundlePath.replaceFirst("^reference:file:", ""); //$NON-NLS-1$ //$NON-NLS-2$

+			final String bundlePath = bundle.getLocation();

+			String filePath;

+			final Location platformInstall = Platform.getInstallLocation();

+			final URL url = platformInstall.getURL();

+			final String installPath = url.toString().replaceAll(".*file:", ""); //$NON-NLS-1$ //$NON-NLS-2$

+			if (bundlePath

+					.startsWith("initial@reference:file:")) { //$NON-NLS-1$

+				// cas d'un chemin relatif

+				filePath = bundlePath.replaceAll(

+						"initial@reference:file:", //$NON-NLS-1$

+						installPath);

+			} else {

+				filePath = bundlePath.replaceFirst("^reference:file:", ""); //$NON-NLS-1$ //$NON-NLS-2$

+			}

 			File bundleFile = new File(filePath);

 			if (bundleFile.isDirectory()) {

 				FolderUtils.copyDirectory(bundleFile, project.getLocation().toFile(), filter);

@@ -310,7 +324,7 @@
 									f.create(true, true, new NullProgressMonitor());

 								}

 							} else {

-								InputStream is = zip.getInputStream(zipEntry);

+								InputStream inputStream = zip.getInputStream(zipEntry);

 								IFile f = project.getFile(zipEntry.getName());

 								if (!f.getParent().exists()) {

 									if (f.getParent() instanceof IFolder) {

@@ -321,7 +335,7 @@
 								if (f.exists()) {

 									f.delete(true, new NullProgressMonitor());

 								}

-								f.create(is, true, new NullProgressMonitor());

+								f.create(inputStream, true, new NullProgressMonitor());

 							}

 						}

 					} catch (Exception e) {

diff --git a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/logging/MoDiscoLogger.java b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/logging/MoDiscoLogger.java
index 33c7bc5..c256848 100644
--- a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/logging/MoDiscoLogger.java
+++ b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/logging/MoDiscoLogger.java
@@ -24,8 +24,10 @@
  * Helper for logging using Eclipse API

  * 

  * @author fgiquel

- * 

+ * @deprecated Replaced by org.eclipse.emf.facet.util.core.Logger,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470725

  */

+@Deprecated

 public final class MoDiscoLogger {

 

 	private MoDiscoLogger() {

diff --git a/org.eclipse.gmt.modisco.infra.common.ui/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.common.ui/META-INF/MANIFEST.MF
index 1d269fa..55bf628 100644
--- a/org.eclipse.gmt.modisco.infra.common.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.common.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.common.ui;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.gmt.modisco.infra.common.ui.internal.MoDiscoCommonUIPlugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/org.eclipse.gmt.modisco.infra.discoverymanager/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.discoverymanager/META-INF/MANIFEST.MF
index 67a30ee..5b8d5d2 100644
--- a/org.eclipse.gmt.modisco.infra.discoverymanager/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.discoverymanager/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Name: %pluginName

 Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.discoverymanager;singleton:=true

 Bundle-Vendor: %providerName

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-ClassPath: .

 Bundle-Localization: plugin

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/org.eclipse.gmt.modisco.infra.discoverymanager/plugin.properties b/org.eclipse.gmt.modisco.infra.discoverymanager/plugin.properties
index 464fcee..b5cceea 100644
--- a/org.eclipse.gmt.modisco.infra.discoverymanager/plugin.properties
+++ b/org.eclipse.gmt.modisco.infra.discoverymanager/plugin.properties
@@ -9,10 +9,10 @@
 #    Gabriel Barbier (Mia-Software) - initial API and implementation

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

 # NLS_MESSAGEFORMAT_VAR

-pluginName=MoDisco Manager of discoverers (Incubation)

+pluginName=MoDisco Manager of discoverers (Deprecated) (Incubation)

 providerName=Eclipse Modeling Project

 

 extension.name = MoDisco

-launchConfigurationType.name = MoDisco Discoverer

-extension-point.name = To add discoverers

-extension-point.name.0 = Discoverers cell content editors
\ No newline at end of file
+launchConfigurationType.name = MoDisco Discoverer (Deprecated)

+extension-point.name = To add discoverers (Deprecated)

+extension-point.name.0 = Discoverers cell content editors (Deprecated)
\ No newline at end of file
diff --git a/org.eclipse.gmt.modisco.infra.discoverymanager/schema/discoverers.exsd b/org.eclipse.gmt.modisco.infra.discoverymanager/schema/discoverers.exsd
index a6c53db..4203655 100644
--- a/org.eclipse.gmt.modisco.infra.discoverymanager/schema/discoverers.exsd
+++ b/org.eclipse.gmt.modisco.infra.discoverymanager/schema/discoverers.exsd
@@ -3,10 +3,10 @@
 <schema targetNamespace="org.eclipse.gmt.modisco.discoverers" xmlns="http://www.w3.org/2001/XMLSchema">

 <annotation>

       <appinfo>

-         <meta.schema plugin="org.eclipse.gmt.modisco.discoverers" id="discoverer" name="Add a discoverer"/>

+         <meta.schema plugin="org.eclipse.gmt.modisco.discoverers" id="discoverer" name="Add a discoverer (Deprecated)"/>

       </appinfo>

       <documentation>

-         To add discoverer in MoDisco framework.

+         To add discoverer in MoDisco framework. (Deprecated)

       </documentation>

    </annotation>

 

diff --git a/org.eclipse.gmt.modisco.infra.discoverymanager/src/org/eclipse/gmt/modisco/infra/discoverymanager/Discoverer.java b/org.eclipse.gmt.modisco.infra.discoverymanager/src/org/eclipse/gmt/modisco/infra/discoverymanager/Discoverer.java
index 6cffa0b..74cfe99 100644
--- a/org.eclipse.gmt.modisco.infra.discoverymanager/src/org/eclipse/gmt/modisco/infra/discoverymanager/Discoverer.java
+++ b/org.eclipse.gmt.modisco.infra.discoverymanager/src/org/eclipse/gmt/modisco/infra/discoverymanager/Discoverer.java
@@ -23,7 +23,8 @@
  * component that injects information into a model to represent physical

  * elements (a source file is considered as a physical element).

  * 

- * @deprecated use org.eclipse.modisco.infra.discovery.core framework

+ * @deprecated use org.eclipse.modisco.infra.discovery.core framework, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=343840

  */

 @Deprecated

 public interface Discoverer {

diff --git a/org.eclipse.gmt.modisco.infra.facet.core/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.facet.core/META-INF/MANIFEST.MF
index 10500d9..0c2d7c2 100644
--- a/org.eclipse.gmt.modisco.infra.facet.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.facet.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.facet.core;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.gmt.modisco.infra.facet.core.internal.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.gmt.modisco.infra.facet.core/OSGI-INF/l10n/bundle.properties b/org.eclipse.gmt.modisco.infra.facet.core/OSGI-INF/l10n/bundle.properties
index 061edbb..2223c9a 100644
--- a/org.eclipse.gmt.modisco.infra.facet.core/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.gmt.modisco.infra.facet.core/OSGI-INF/l10n/bundle.properties
@@ -12,6 +12,6 @@
 extension.name = facetBuilder

 extension-point.name = org.eclipse.gmt.modisco.infra.facet.registration

 Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = MoDisco Facet Core (Incubation)

+Bundle-Name = MoDisco Facet Core (Deprecated, has to be replaced by EMF Facet) (Incubation)

 extension-point.name.0 = org.eclipse.gmt.modisco.infra.facet.registration

 extension-point.name.1 = Facet refresh strategy
\ No newline at end of file
diff --git a/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/FacetContext.java b/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/FacetContext.java
index c300f46..7968159 100644
--- a/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/FacetContext.java
+++ b/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/FacetContext.java
@@ -48,8 +48,9 @@
 

 /**

  * @author Gregoire DUPE

- * 

+ * @deprecated Replaced by EMF Facet

  */

+@Deprecated

 public class FacetContext {

 

 	private final Set<Facet> appliedFacets = new HashSet<Facet>();

diff --git a/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/FacetContextListener.java b/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/FacetContextListener.java
index 8fa6267..ceac095 100644
--- a/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/FacetContextListener.java
+++ b/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/FacetContextListener.java
@@ -12,6 +12,10 @@
 

 import org.eclipse.gmt.modisco.infra.facet.Facet;

 

+/**

+ * @deprecated Replaced by EMF Facet

+ */

+@Deprecated

 public interface FacetContextListener {

 	void facetAdded(Facet facet);

 

diff --git a/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/FacetSetCatalog.java b/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/FacetSetCatalog.java
index 8b5e98d..a384fa4 100644
--- a/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/FacetSetCatalog.java
+++ b/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/FacetSetCatalog.java
@@ -32,6 +32,10 @@
 import org.eclipse.gmt.modisco.infra.facet.validation.EValidatorAdapter;

 import org.eclipse.gmt.modisco.infra.query.core.ModelQuerySetCatalog;

 

+/**

+ * @deprecated Replaced by EMF Facet

+ */

+@Deprecated

 public final class FacetSetCatalog extends EcoreCatalog implements ModiscoCatalogChangeListener {

 

 	public static final String REGISTRATION_EXTENSION_POINT_ID = "org.eclipse.gmt.modisco.infra.facet.registration"; //$NON-NLS-1$

diff --git a/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/adapters/instances/MetaclassInstancesAdapterFactoryWithFacet.java b/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/adapters/instances/MetaclassInstancesAdapterFactoryWithFacet.java
index 29047f8..88663c2 100644
--- a/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/adapters/instances/MetaclassInstancesAdapterFactoryWithFacet.java
+++ b/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/adapters/instances/MetaclassInstancesAdapterFactoryWithFacet.java
@@ -17,6 +17,10 @@
 import org.eclipse.gmt.modisco.infra.common.core.internal.adapters.instances.MetaclassInstances;

 import org.eclipse.gmt.modisco.infra.facet.core.FacetContext;

 

+/**

+ * @deprecated Replaced by EMF Facet

+ */

+@Deprecated

 public final class MetaclassInstancesAdapterFactoryWithFacet extends AdapterFactoryImpl {

 	private static final MetaclassInstancesAdapterFactoryWithFacet INSTANCE = new MetaclassInstancesAdapterFactoryWithFacet();

 

diff --git a/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/adapters/instances/MetaclassInstancesAdapterWithFacet.java b/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/adapters/instances/MetaclassInstancesAdapterWithFacet.java
index 62428d1..e1e2eb6 100644
--- a/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/adapters/instances/MetaclassInstancesAdapterWithFacet.java
+++ b/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/adapters/instances/MetaclassInstancesAdapterWithFacet.java
@@ -45,7 +45,9 @@
  * MetaclassInstancesAdapterFactoryWithFacet.getInstance().setFacetContext(facetContext);<br>

  * MetaclassInstances instances = (MetaclassInstances) MetaclassInstancesAdapterFactoryWithFacet.getInstance().adapt(resource, MetaclassInstances.class);

  * </code>

+ * @deprecated Replaced by EMF Facet

  */

+@Deprecated

 public class MetaclassInstancesAdapterWithFacet extends MetaclassInstancesAdapter implements

 		FacetContextListener {

 

diff --git a/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/exception/ModiscoFacetException.java b/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/exception/ModiscoFacetException.java
index bce76d6..0f63e62 100644
--- a/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/exception/ModiscoFacetException.java
+++ b/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/exception/ModiscoFacetException.java
@@ -12,7 +12,9 @@
 

 /**

  * @author Gregoire DUPE (Mia-Software) {@inheritDoc}

+ * @deprecated Replaced by EMF Facet

  */

+@Deprecated

 public class ModiscoFacetException extends Exception {

 

 	/**

diff --git a/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/exception/StructuralConstraintViolationException.java b/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/exception/StructuralConstraintViolationException.java
index 6ac6620..e835379 100644
--- a/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/exception/StructuralConstraintViolationException.java
+++ b/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/exception/StructuralConstraintViolationException.java
@@ -12,7 +12,9 @@
 

 /**

  * @author Gregoire DUPE (Mia-Software) {@inheritDoc}

+ * @deprecated Replaced by EMF Facet

  */

+@Deprecated

 public class StructuralConstraintViolationException extends ModiscoFacetException {

 

 	/**

diff --git a/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/extensions/RefreshStrategy.java b/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/extensions/RefreshStrategy.java
index 7162813..cc5fb12 100644
--- a/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/extensions/RefreshStrategy.java
+++ b/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/extensions/RefreshStrategy.java
@@ -16,6 +16,10 @@
 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gmt.modisco.infra.facet.Facet;

 

+/**

+ * @deprecated Replaced by EMF Facet

+ */

+@Deprecated

 public interface RefreshStrategy {

 	/**

 	 * This method must compute and return the list of elements for which a

diff --git a/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/internal/Activator.java b/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/internal/Activator.java
index a49310a..3da3e90 100644
--- a/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/internal/Activator.java
+++ b/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/internal/Activator.java
@@ -15,7 +15,9 @@
 

 /**

  * The activator class controls the plug-in life cycle

+ * @deprecated Replaced by EMF Facet

  */

+@Deprecated

 public class Activator extends AbstractUIPlugin {

 

 	// The plug-in ID

diff --git a/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/internal/FacetBuilder.java b/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/internal/FacetBuilder.java
index d73e38e..7d33934 100644
--- a/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/internal/FacetBuilder.java
+++ b/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/internal/FacetBuilder.java
@@ -16,6 +16,10 @@
 import org.eclipse.gmt.modisco.infra.common.core.internal.builder.MoDiscoCatalogBuilder;

 import org.eclipse.gmt.modisco.infra.facet.core.FacetSetCatalog;

 

+/**

+ * @deprecated Replaced by EMF Facet

+ */

+@Deprecated

 public class FacetBuilder extends MoDiscoCatalogBuilder {

 

 	protected static final String FILE_EXTENSION = "facetSet"; //$NON-NLS-1$

diff --git a/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/internal/FacetProtocolExtension.java b/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/internal/FacetProtocolExtension.java
index d7a9499..0ea1292 100644
--- a/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/internal/FacetProtocolExtension.java
+++ b/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/internal/FacetProtocolExtension.java
@@ -14,6 +14,10 @@
 import org.eclipse.gmt.modisco.infra.common.core.internal.protocol.IModiscoProtocolExtension;

 import org.eclipse.gmt.modisco.infra.facet.core.FacetSetCatalog;

 

+/**

+ * @deprecated Replaced by EMF Facet

+ */

+@Deprecated

 public class FacetProtocolExtension implements IModiscoProtocolExtension {

 

 	/*

diff --git a/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/internal/Messages.java b/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/internal/Messages.java
index 1d2022f..4338079 100644
--- a/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/internal/Messages.java
+++ b/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/internal/Messages.java
@@ -12,6 +12,10 @@
 

 import org.eclipse.osgi.util.NLS;

 

+/**

+ * @deprecated Replaced by EMF Facet

+ */

+@Deprecated

 public class Messages extends NLS {

 	private static final String BUNDLE_NAME = "org.eclipse.gmt.modisco.infra.facet.core.internal.messages"; //$NON-NLS-1$

 	public static String FacetBuilder_facetSet;

diff --git a/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/internal/extensions/RefreshStrategiesRegistry.java b/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/internal/extensions/RefreshStrategiesRegistry.java
index 608ca97..0bc7f2b 100644
--- a/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/internal/extensions/RefreshStrategiesRegistry.java
+++ b/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/internal/extensions/RefreshStrategiesRegistry.java
@@ -23,7 +23,11 @@
 import org.eclipse.gmt.modisco.infra.facet.core.extensions.RefreshStrategy;

 import org.eclipse.gmt.modisco.infra.facet.core.internal.Activator;

 

-/** Registry for the "facetRefreshStrategy" extension point */

+/**

+ * Registry for the "facetRefreshStrategy" extension point

+ * @deprecated Replaced by EMF Facet

+ */

+@Deprecated

 public class RefreshStrategiesRegistry extends AbstractRegistry {

 

 	private static final String EXTENSION_POINT_NAMESPACE = "org.eclipse.gmt.modisco.infra.facet.core"; //$NON-NLS-1$

diff --git a/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/internal/utils/QueryToFacetSet.java b/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/internal/utils/QueryToFacetSet.java
index 6a7b28e..8844b31 100644
--- a/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/internal/utils/QueryToFacetSet.java
+++ b/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/internal/utils/QueryToFacetSet.java
@@ -38,7 +38,9 @@
  * querySet's name facet's name in the FacetSet are directly their corresponding

  * name in the QuerySet

  * 

+ * @deprecated Replaced by EMF Facet

  */

+@Deprecated

 public final class QueryToFacetSet {

 

 	private static String nsUri = "http://www.eclipse.org/FacetSet/"; //$NON-NLS-1$

diff --git a/org.eclipse.gmt.modisco.infra.facet.edit/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.facet.edit/META-INF/MANIFEST.MF
index 141d80c..d7108ca 100644
--- a/org.eclipse.gmt.modisco.infra.facet.edit/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.facet.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %pluginName

 Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.facet.edit;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-ClassPath: .

 Bundle-Activator: org.eclipse.gmt.modisco.infra.facet.edit.provider.FacetEditPlugin$Implementation

 Bundle-Vendor: %providerName

diff --git a/org.eclipse.gmt.modisco.infra.facet.edit/plugin.properties b/org.eclipse.gmt.modisco.infra.facet.edit/plugin.properties
index 56fe437..eba14a4 100644
--- a/org.eclipse.gmt.modisco.infra.facet.edit/plugin.properties
+++ b/org.eclipse.gmt.modisco.infra.facet.edit/plugin.properties
@@ -8,7 +8,7 @@
 # Contributors:

 #    Gregoire DUPE (Mia-Software) - initial API and implementation

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

-pluginName = MoDisco Facet Edit Support (Incubation)

+pluginName = MoDisco Facet Edit Support (Deprecated, has to be replaced by EMF Facet) (Incubation)

 providerName = Eclipse Modeling Project

 

 _UI_CreateChild_text = {0}

diff --git a/org.eclipse.gmt.modisco.infra.facet.edit/src/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetAttributeItemProvider.java b/org.eclipse.gmt.modisco.infra.facet.edit/src/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetAttributeItemProvider.java
index 127acc2..fe222cc 100644
--- a/org.eclipse.gmt.modisco.infra.facet.edit/src/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetAttributeItemProvider.java
+++ b/org.eclipse.gmt.modisco.infra.facet.edit/src/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetAttributeItemProvider.java
@@ -40,7 +40,9 @@
  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

  * @generated

+ * @deprecated Replaced by EMF Facet

  */

+@Deprecated

 public class FacetAttributeItemProvider

 	extends EAttributeItemProvider

 	implements

diff --git a/org.eclipse.gmt.modisco.infra.facet.edit/src/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetEditPlugin.java b/org.eclipse.gmt.modisco.infra.facet.edit/src/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetEditPlugin.java
index f9f524d..372cf9f 100644
--- a/org.eclipse.gmt.modisco.infra.facet.edit/src/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetEditPlugin.java
+++ b/org.eclipse.gmt.modisco.infra.facet.edit/src/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetEditPlugin.java
@@ -15,11 +15,8 @@
 package org.eclipse.gmt.modisco.infra.facet.edit.provider;

 

 import org.eclipse.emf.common.EMFPlugin;

-

 import org.eclipse.emf.common.util.ResourceLocator;

-

 import org.eclipse.emf.ecore.provider.EcoreEditPlugin;

-

 import org.eclipse.gmt.modisco.infra.query.edit.provider.QueryEditPlugin;

 

 /**

@@ -27,7 +24,9 @@
  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

  * @generated

+ * @deprecated Replaced by EMF Facet

  */

+@Deprecated

 public final class FacetEditPlugin extends EMFPlugin {

 	/**

 	 * Keep track of the singleton.

diff --git a/org.eclipse.gmt.modisco.infra.facet.edit/src/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetItemProvider.java b/org.eclipse.gmt.modisco.infra.facet.edit/src/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetItemProvider.java
index 672ac0f..84da768 100644
--- a/org.eclipse.gmt.modisco.infra.facet.edit/src/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetItemProvider.java
+++ b/org.eclipse.gmt.modisco.infra.facet.edit/src/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetItemProvider.java
@@ -42,7 +42,9 @@
  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

  * @generated

+ * @deprecated Replaced by EMF Facet

  */

+@Deprecated

 public class FacetItemProvider extends EClassItemProvider implements

 		IEditingDomainItemProvider, IStructuredItemContentProvider,

 		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {

diff --git a/org.eclipse.gmt.modisco.infra.facet.edit/src/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetItemProviderAdapterFactory.java b/org.eclipse.gmt.modisco.infra.facet.edit/src/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetItemProviderAdapterFactory.java
index c6b82d1..042dd1d 100644
--- a/org.eclipse.gmt.modisco.infra.facet.edit/src/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetItemProviderAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.infra.facet.edit/src/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetItemProviderAdapterFactory.java
@@ -20,7 +20,6 @@
 import org.eclipse.emf.common.notify.Adapter;

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.common.notify.Notifier;

-

 import org.eclipse.emf.edit.provider.ChangeNotifier;

 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

 import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

@@ -32,7 +31,6 @@
 import org.eclipse.emf.edit.provider.INotifyChangedListener;

 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-

 import org.eclipse.gmt.modisco.infra.facet.util.FacetAdapterFactory;

 

 /**

@@ -43,7 +41,9 @@
  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

  * @generated

+ * @deprecated Replaced by EMF Facet

  */

+@Deprecated

 public class FacetItemProviderAdapterFactory extends FacetAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {

 	/**

 	 * This keeps track of the root adapter factory that delegates to this adapter factory.

diff --git a/org.eclipse.gmt.modisco.infra.facet.edit/src/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetReferenceItemProvider.java b/org.eclipse.gmt.modisco.infra.facet.edit/src/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetReferenceItemProvider.java
index 5aedc13..d60e960 100644
--- a/org.eclipse.gmt.modisco.infra.facet.edit/src/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetReferenceItemProvider.java
+++ b/org.eclipse.gmt.modisco.infra.facet.edit/src/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetReferenceItemProvider.java
@@ -39,7 +39,9 @@
  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

  * @generated

+ * @deprecated Replaced by EMF Facet

  */

+@Deprecated

 public class FacetReferenceItemProvider

 	extends EReferenceItemProvider

 	implements

diff --git a/org.eclipse.gmt.modisco.infra.facet.edit/src/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetSetItemProvider.java b/org.eclipse.gmt.modisco.infra.facet.edit/src/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetSetItemProvider.java
index 32819a9..b8512d2 100644
--- a/org.eclipse.gmt.modisco.infra.facet.edit/src/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetSetItemProvider.java
+++ b/org.eclipse.gmt.modisco.infra.facet.edit/src/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetSetItemProvider.java
@@ -43,7 +43,9 @@
  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

  * @generated

+ * @deprecated Replaced by EMF Facet

  */

+@Deprecated

 public class FacetSetItemProvider

 	extends EPackageItemProvider

 	implements

diff --git a/org.eclipse.gmt.modisco.infra.facet.edit/src/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetStructuralFeatureItemProvider.java b/org.eclipse.gmt.modisco.infra.facet.edit/src/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetStructuralFeatureItemProvider.java
index a24955d..9d0fd53 100644
--- a/org.eclipse.gmt.modisco.infra.facet.edit/src/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetStructuralFeatureItemProvider.java
+++ b/org.eclipse.gmt.modisco.infra.facet.edit/src/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetStructuralFeatureItemProvider.java
@@ -36,7 +36,9 @@
  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

  * @generated

+ * @deprecated Replaced by EMF Facet

  */

+@Deprecated

 public class FacetStructuralFeatureItemProvider

 	extends ItemProviderAdapter

 	implements

diff --git a/org.eclipse.gmt.modisco.infra.facet.edit/src/org/eclipse/gmt/modisco/infra/facet/edit/provider/ShortcutItemProvider.java b/org.eclipse.gmt.modisco.infra.facet.edit/src/org/eclipse/gmt/modisco/infra/facet/edit/provider/ShortcutItemProvider.java
index d66d977..1dfe486 100644
--- a/org.eclipse.gmt.modisco.infra.facet.edit/src/org/eclipse/gmt/modisco/infra/facet/edit/provider/ShortcutItemProvider.java
+++ b/org.eclipse.gmt.modisco.infra.facet.edit/src/org/eclipse/gmt/modisco/infra/facet/edit/provider/ShortcutItemProvider.java
@@ -20,14 +20,10 @@
 

 import org.eclipse.emf.common.notify.AdapterFactory;

 import org.eclipse.emf.common.notify.Notification;

-

 import org.eclipse.emf.common.util.ResourceLocator;

-

 import org.eclipse.emf.ecore.EStructuralFeature;

 import org.eclipse.emf.ecore.EcoreFactory;

-

 import org.eclipse.emf.ecore.provider.EReferenceItemProvider;

-

 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

 import org.eclipse.emf.edit.provider.IItemLabelProvider;

@@ -36,7 +32,6 @@
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

 import org.eclipse.emf.edit.provider.ViewerNotification;

-

 import org.eclipse.gmt.modisco.infra.facet.FacetFactory;

 import org.eclipse.gmt.modisco.infra.facet.FacetPackage;

 import org.eclipse.gmt.modisco.infra.facet.Shortcut;

@@ -46,7 +41,9 @@
  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

  * @generated

+ * @deprecated Replaced by EMF Facet

  */

+@Deprecated

 public class ShortcutItemProvider

 	extends EReferenceItemProvider

 	implements

diff --git a/org.eclipse.gmt.modisco.infra.facet.editor/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.facet.editor/META-INF/MANIFEST.MF
index 6d4b714..5baeb65 100644
--- a/org.eclipse.gmt.modisco.infra.facet.editor/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.facet.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %pluginName

 Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.facet.editor;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-ClassPath: .

 Bundle-Activator: org.eclipse.gmt.modisco.infra.facet.editor.presentation.FacetEditorPlugin$Implementation

 Bundle-Vendor: %providerName

diff --git a/org.eclipse.gmt.modisco.infra.facet.editor/plugin.properties b/org.eclipse.gmt.modisco.infra.facet.editor/plugin.properties
index 7bb3c82..e41d140 100644
--- a/org.eclipse.gmt.modisco.infra.facet.editor/plugin.properties
+++ b/org.eclipse.gmt.modisco.infra.facet.editor/plugin.properties
@@ -8,7 +8,7 @@
 # Contributors:

 #    Gregoire DUPE (Mia-Software) - initial API and implementation

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

-pluginName = MoDisco Facet Editor (Incubation)

+pluginName = MoDisco Facet Editor (Deprecated, has to be replaced by EMF Facet) (Incubation)

 providerName = Eclipse Modeling Project

 

 _UI_FacetEditor_menu = &Facet Editor

diff --git a/org.eclipse.gmt.modisco.infra.facet.editor/src/org/eclipse/gmt/modisco/infra/facet/editor/Messages.java b/org.eclipse.gmt.modisco.infra.facet.editor/src/org/eclipse/gmt/modisco/infra/facet/editor/Messages.java
index d43c8e6..47b8d61 100644
--- a/org.eclipse.gmt.modisco.infra.facet.editor/src/org/eclipse/gmt/modisco/infra/facet/editor/Messages.java
+++ b/org.eclipse.gmt.modisco.infra.facet.editor/src/org/eclipse/gmt/modisco/infra/facet/editor/Messages.java
@@ -12,6 +12,10 @@
 

 import org.eclipse.osgi.util.NLS;

 

+/**

+ * @deprecated Replaced by EMF Facet

+ */

+@Deprecated

 public class Messages extends NLS {

 	private static final String BUNDLE_NAME = "org.eclipse.gmt.modisco.infra.facet.editor.messages"; //$NON-NLS-1$

 	public static String FacetEditor_Edition;

diff --git a/org.eclipse.gmt.modisco.infra.facet.editor/src/org/eclipse/gmt/modisco/infra/facet/editor/presentation/FacetActionBarContributor.java b/org.eclipse.gmt.modisco.infra.facet.editor/src/org/eclipse/gmt/modisco/infra/facet/editor/presentation/FacetActionBarContributor.java
index 3151e11..e937c64 100644
--- a/org.eclipse.gmt.modisco.infra.facet.editor/src/org/eclipse/gmt/modisco/infra/facet/editor/presentation/FacetActionBarContributor.java
+++ b/org.eclipse.gmt.modisco.infra.facet.editor/src/org/eclipse/gmt/modisco/infra/facet/editor/presentation/FacetActionBarContributor.java
@@ -51,7 +51,9 @@
  * begin-user-doc --> <!-- end-user-doc -->

  * 

  * @generated

+ * @deprecated Replaced by EMF Facet

  */

+@Deprecated

 public class FacetActionBarContributor extends

 		EditingDomainActionBarContributor implements ISelectionChangedListener {

 	/**

diff --git a/org.eclipse.gmt.modisco.infra.facet.editor/src/org/eclipse/gmt/modisco/infra/facet/editor/presentation/FacetEditor.java b/org.eclipse.gmt.modisco.infra.facet.editor/src/org/eclipse/gmt/modisco/infra/facet/editor/presentation/FacetEditor.java
index 408ac39..d577369 100644
--- a/org.eclipse.gmt.modisco.infra.facet.editor/src/org/eclipse/gmt/modisco/infra/facet/editor/presentation/FacetEditor.java
+++ b/org.eclipse.gmt.modisco.infra.facet.editor/src/org/eclipse/gmt/modisco/infra/facet/editor/presentation/FacetEditor.java
@@ -165,7 +165,9 @@
  * end-user-doc -->

  * 

  * @generated NOT

+ * @deprecated Replaced by EMF Facet

  */

+@Deprecated

 public class FacetEditor extends MultiPageEditorPart implements IEditingDomainProvider,

 		ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {

 

diff --git a/org.eclipse.gmt.modisco.infra.facet.editor/src/org/eclipse/gmt/modisco/infra/facet/editor/presentation/FacetEditorPlugin.java b/org.eclipse.gmt.modisco.infra.facet.editor/src/org/eclipse/gmt/modisco/infra/facet/editor/presentation/FacetEditorPlugin.java
index b3b7cbd..46e55c8 100644
--- a/org.eclipse.gmt.modisco.infra.facet.editor/src/org/eclipse/gmt/modisco/infra/facet/editor/presentation/FacetEditorPlugin.java
+++ b/org.eclipse.gmt.modisco.infra.facet.editor/src/org/eclipse/gmt/modisco/infra/facet/editor/presentation/FacetEditorPlugin.java
@@ -15,13 +15,9 @@
 package org.eclipse.gmt.modisco.infra.facet.editor.presentation;

 

 import org.eclipse.emf.common.EMFPlugin;

-

 import org.eclipse.emf.common.ui.EclipseUIPlugin;

-

 import org.eclipse.emf.common.util.ResourceLocator;

-

 import org.eclipse.emf.ecore.provider.EcoreEditPlugin;

-

 import org.eclipse.gmt.modisco.infra.query.edit.provider.QueryEditPlugin;

 

 /**

@@ -29,7 +25,9 @@
  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

  * @generated

+ * @deprecated Replaced by EMF Facet

  */

+@Deprecated

 public final class FacetEditorPlugin extends EMFPlugin {

 	/**

 	 * Keep track of the singleton.

diff --git a/org.eclipse.gmt.modisco.infra.facet.editor/src/org/eclipse/gmt/modisco/infra/facet/editor/presentation/FacetModelWizard.java b/org.eclipse.gmt.modisco.infra.facet.editor/src/org/eclipse/gmt/modisco/infra/facet/editor/presentation/FacetModelWizard.java
index f9989f6..f91e07f 100644
--- a/org.eclipse.gmt.modisco.infra.facet.editor/src/org/eclipse/gmt/modisco/infra/facet/editor/presentation/FacetModelWizard.java
+++ b/org.eclipse.gmt.modisco.infra.facet.editor/src/org/eclipse/gmt/modisco/infra/facet/editor/presentation/FacetModelWizard.java
@@ -70,7 +70,9 @@
  * --> <!-- end-user-doc -->

  * 

  * @generated NOT

+ * @deprecated Replaced by EMF Facet

  */

+@Deprecated

 public class FacetModelWizard extends Wizard implements INewWizard {

 	/**

 	 * The supported extensions for created files. <!-- begin-user-doc --> <!--

diff --git a/org.eclipse.gmt.modisco.infra.facet.editor/src/org/eclipse/gmt/modisco/infra/facet/editor/presentation/LoadMetaModelResourceAction.java b/org.eclipse.gmt.modisco.infra.facet.editor/src/org/eclipse/gmt/modisco/infra/facet/editor/presentation/LoadMetaModelResourceAction.java
index 4896ae8..c300c61 100644
--- a/org.eclipse.gmt.modisco.infra.facet.editor/src/org/eclipse/gmt/modisco/infra/facet/editor/presentation/LoadMetaModelResourceAction.java
+++ b/org.eclipse.gmt.modisco.infra.facet.editor/src/org/eclipse/gmt/modisco/infra/facet/editor/presentation/LoadMetaModelResourceAction.java
@@ -34,8 +34,9 @@
 

 /**

  * @author Gregoire DUPE

- * 

+ * @deprecated Replaced by EMF Facet

  */

+@Deprecated

 public class LoadMetaModelResourceAction extends LoadResourceAction {

 

 	public LoadMetaModelResourceAction() {

diff --git a/org.eclipse.gmt.modisco.infra.facet.editor/src/org/eclipse/gmt/modisco/infra/facet/editor/presentation/LoadMoDiscoResourceAction.java b/org.eclipse.gmt.modisco.infra.facet.editor/src/org/eclipse/gmt/modisco/infra/facet/editor/presentation/LoadMoDiscoResourceAction.java
index 950feeb..923ce77 100644
--- a/org.eclipse.gmt.modisco.infra.facet.editor/src/org/eclipse/gmt/modisco/infra/facet/editor/presentation/LoadMoDiscoResourceAction.java
+++ b/org.eclipse.gmt.modisco.infra.facet.editor/src/org/eclipse/gmt/modisco/infra/facet/editor/presentation/LoadMoDiscoResourceAction.java
@@ -33,8 +33,9 @@
 

 /**

  * @author Gregoire DUPE

- * 

+ * @deprecated Replaced by EMF Facet

  */

+@Deprecated

 public class LoadMoDiscoResourceAction extends LoadResourceAction {

 

 	public LoadMoDiscoResourceAction() {

diff --git a/org.eclipse.gmt.modisco.infra.facet.examples.kdm/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.facet.examples.kdm/META-INF/MANIFEST.MF
index f165c45..f9e3ae0 100644
--- a/org.eclipse.gmt.modisco.infra.facet.examples.kdm/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.facet.examples.kdm/META-INF/MANIFEST.MF
@@ -14,4 +14,4 @@
  org.eclipse.emf.ecore,

  org.eclipse.gmt.modisco.infra.facet.core,

  com.ibm.icu;bundle-version="4.2.1"

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

diff --git a/org.eclipse.gmt.modisco.infra.facet.examples.kdm/OSGI-INF/l10n/bundle.properties b/org.eclipse.gmt.modisco.infra.facet.examples.kdm/OSGI-INF/l10n/bundle.properties
index b860a22..2e7c67a 100644
--- a/org.eclipse.gmt.modisco.infra.facet.examples.kdm/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.gmt.modisco.infra.facet.examples.kdm/OSGI-INF/l10n/bundle.properties
@@ -10,4 +10,4 @@
 ###############################################################################

 #Properties file for org.eclipse.gmt.modisco.usecase.linecount

 Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = MoDisco Facet to count lines in KDM InventoryItems (Incubation)
\ No newline at end of file
+Bundle-Name = MoDisco Facet to count lines in KDM InventoryItems (Deprecated, will be replaced by EMF Facet) (Incubation)
\ No newline at end of file
diff --git a/org.eclipse.gmt.modisco.infra.facet.examples.kdm/src/org/eclipse/gmt/modisco/infra/facet/examples/kdm/AbstractRecursiveCount.java b/org.eclipse.gmt.modisco.infra.facet.examples.kdm/src/org/eclipse/gmt/modisco/infra/facet/examples/kdm/AbstractRecursiveCount.java
index 35834a7..864195a 100644
--- a/org.eclipse.gmt.modisco.infra.facet.examples.kdm/src/org/eclipse/gmt/modisco/infra/facet/examples/kdm/AbstractRecursiveCount.java
+++ b/org.eclipse.gmt.modisco.infra.facet.examples.kdm/src/org/eclipse/gmt/modisco/infra/facet/examples/kdm/AbstractRecursiveCount.java
@@ -20,7 +20,10 @@
 import org.eclipse.gmt.modisco.omg.kdm.source.AbstractInventoryElement;

 import org.eclipse.gmt.modisco.omg.kdm.source.InventoryContainer;

 import org.eclipse.gmt.modisco.omg.kdm.source.InventoryItem;

-

+/**

+ * @deprecated Replaced by EMF Facet

+ */

+@Deprecated

 public abstract class AbstractRecursiveCount implements IJavaModelQuery<EObject, Integer> {

 	public Integer evaluate(final EObject context, final ParameterValueList parameterValues)

 			throws ModelQueryExecutionException {

diff --git a/org.eclipse.gmt.modisco.infra.facet.examples.kdm/src/org/eclipse/gmt/modisco/infra/facet/examples/kdm/Activator.java b/org.eclipse.gmt.modisco.infra.facet.examples.kdm/src/org/eclipse/gmt/modisco/infra/facet/examples/kdm/Activator.java
index bd94d91..9c7f743 100644
--- a/org.eclipse.gmt.modisco.infra.facet.examples.kdm/src/org/eclipse/gmt/modisco/infra/facet/examples/kdm/Activator.java
+++ b/org.eclipse.gmt.modisco.infra.facet.examples.kdm/src/org/eclipse/gmt/modisco/infra/facet/examples/kdm/Activator.java
@@ -13,7 +13,11 @@
 import org.eclipse.core.runtime.Plugin;
 import org.osgi.framework.BundleContext;
 
-/** The activator class controls the plug-in life cycle */
+/**

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

+ * @deprecated Replaced by EMF Facet

+ */

+@Deprecated
 public class Activator extends Plugin {
 
 	// The plug-in ID
diff --git a/org.eclipse.gmt.modisco.infra.facet.examples.kdm/src/org/eclipse/gmt/modisco/infra/facet/examples/kdm/LineCountHelper.java b/org.eclipse.gmt.modisco.infra.facet.examples.kdm/src/org/eclipse/gmt/modisco/infra/facet/examples/kdm/LineCountHelper.java
index 03a56c6..6a78d06 100644
--- a/org.eclipse.gmt.modisco.infra.facet.examples.kdm/src/org/eclipse/gmt/modisco/infra/facet/examples/kdm/LineCountHelper.java
+++ b/org.eclipse.gmt.modisco.infra.facet.examples.kdm/src/org/eclipse/gmt/modisco/infra/facet/examples/kdm/LineCountHelper.java
@@ -21,6 +21,10 @@
 

 import com.ibm.icu.lang.UCharacter;

 

+/**

+ * @deprecated Replaced by EMF Facet

+ */

+@Deprecated

 public final class LineCountHelper {

 	private static final int BUFFER_SIZE = 1024;

 	private static LineCountHelper instance;

diff --git a/org.eclipse.gmt.modisco.infra.facet.examples.kdm/src/org/eclipse/gmt/modisco/infra/facet/examples/kdm/NonEmptyLines.java b/org.eclipse.gmt.modisco.infra.facet.examples.kdm/src/org/eclipse/gmt/modisco/infra/facet/examples/kdm/NonEmptyLines.java
index 023ac2c..be003ad 100644
--- a/org.eclipse.gmt.modisco.infra.facet.examples.kdm/src/org/eclipse/gmt/modisco/infra/facet/examples/kdm/NonEmptyLines.java
+++ b/org.eclipse.gmt.modisco.infra.facet.examples.kdm/src/org/eclipse/gmt/modisco/infra/facet/examples/kdm/NonEmptyLines.java
@@ -18,7 +18,9 @@
 /**

  * The number of lines containing something else than whitespace in this

  * InventoryItem.

+ * @deprecated Replaced by EMF Facet

  */

+@Deprecated

 public class NonEmptyLines extends AbstractRecursiveCount implements

 		IJavaModelQuery<EObject, Integer> {

 	@Override

diff --git a/org.eclipse.gmt.modisco.infra.facet.examples.kdm/src/org/eclipse/gmt/modisco/infra/facet/examples/kdm/NumberOfCharacters.java b/org.eclipse.gmt.modisco.infra.facet.examples.kdm/src/org/eclipse/gmt/modisco/infra/facet/examples/kdm/NumberOfCharacters.java
index fab5e17..fac833f 100644
--- a/org.eclipse.gmt.modisco.infra.facet.examples.kdm/src/org/eclipse/gmt/modisco/infra/facet/examples/kdm/NumberOfCharacters.java
+++ b/org.eclipse.gmt.modisco.infra.facet.examples.kdm/src/org/eclipse/gmt/modisco/infra/facet/examples/kdm/NumberOfCharacters.java
@@ -11,11 +11,15 @@
 package org.eclipse.gmt.modisco.infra.facet.examples.kdm;
 
 import java.io.File;
-
+

 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.gmt.modisco.infra.query.core.java.IJavaModelQuery;
 
-/** Number of characters in the underlying file. */
+/**

+ * Number of characters in the underlying file.

+ * @deprecated Replaced by EMF Facet

+ */

+@Deprecated
 public class NumberOfCharacters extends AbstractRecursiveCount implements
 		IJavaModelQuery<EObject, Integer> {
 	@Override
diff --git a/org.eclipse.gmt.modisco.infra.facet.examples.kdm/src/org/eclipse/gmt/modisco/infra/facet/examples/kdm/NumberOfLines.java b/org.eclipse.gmt.modisco.infra.facet.examples.kdm/src/org/eclipse/gmt/modisco/infra/facet/examples/kdm/NumberOfLines.java
index bb0686a..3d2dc21 100644
--- a/org.eclipse.gmt.modisco.infra.facet.examples.kdm/src/org/eclipse/gmt/modisco/infra/facet/examples/kdm/NumberOfLines.java
+++ b/org.eclipse.gmt.modisco.infra.facet.examples.kdm/src/org/eclipse/gmt/modisco/infra/facet/examples/kdm/NumberOfLines.java
@@ -15,7 +15,11 @@
 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gmt.modisco.infra.query.core.java.IJavaModelQuery;

 

-/** The number of lines in this InventoryItem */

+/**

+ * The number of lines in this InventoryItem

+ * @deprecated Replaced by EMF Facet

+ */

+@Deprecated

 public class NumberOfLines extends AbstractRecursiveCount implements

 		IJavaModelQuery<EObject, Integer> {

 	@Override

diff --git a/org.eclipse.gmt.modisco.infra.facet.ui/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.facet.ui/META-INF/MANIFEST.MF
index dacf8d2..e932fec 100644
--- a/org.eclipse.gmt.modisco.infra.facet.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.facet.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.facet.ui;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.gmt.modisco.infra.facet.ui.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.gmt.modisco.infra.facet.ui/OSGI-INF/l10n/bundle.properties b/org.eclipse.gmt.modisco.infra.facet.ui/OSGI-INF/l10n/bundle.properties
index 08ca06e..f3cc7a8 100644
--- a/org.eclipse.gmt.modisco.infra.facet.ui/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.gmt.modisco.infra.facet.ui/OSGI-INF/l10n/bundle.properties
@@ -13,4 +13,4 @@
 category.name = MoDisco

 catalogView.name = Facet Sets

 Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = MoDisco Facet UI Plug-in (Incubation)
\ No newline at end of file
+Bundle-Name = MoDisco Facet UI Plug-in (Deprecated, has to be replaced by EMF Facet) (Incubation)
\ No newline at end of file
diff --git a/org.eclipse.gmt.modisco.infra.facet.ui/src/org/eclipse/gmt/modisco/infra/facet/ui/Activator.java b/org.eclipse.gmt.modisco.infra.facet.ui/src/org/eclipse/gmt/modisco/infra/facet/ui/Activator.java
index af5bfde..dbabd87 100644
--- a/org.eclipse.gmt.modisco.infra.facet.ui/src/org/eclipse/gmt/modisco/infra/facet/ui/Activator.java
+++ b/org.eclipse.gmt.modisco.infra.facet.ui/src/org/eclipse/gmt/modisco/infra/facet/ui/Activator.java
@@ -16,7 +16,9 @@
 

 /**

  * The activator class controls the plug-in life cycle

+ * @deprecated Replaced by EMF Facet

  */

+@Deprecated

 public class Activator extends AbstractUIPlugin {

 

 	// The plug-in ID

diff --git a/org.eclipse.gmt.modisco.infra.facet.ui/src/org/eclipse/gmt/modisco/infra/facet/ui/ImageProvider.java b/org.eclipse.gmt.modisco.infra.facet.ui/src/org/eclipse/gmt/modisco/infra/facet/ui/ImageProvider.java
index b8e7aa1..d198e66 100644
--- a/org.eclipse.gmt.modisco.infra.facet.ui/src/org/eclipse/gmt/modisco/infra/facet/ui/ImageProvider.java
+++ b/org.eclipse.gmt.modisco.infra.facet.ui/src/org/eclipse/gmt/modisco/infra/facet/ui/ImageProvider.java
@@ -15,8 +15,9 @@
 

 /**

  * @author Gregoire DUPE (Mia-Software)

- * 

+ * @deprecated Replaced by EMF Facet

  */

+@Deprecated

 public class ImageProvider {

 	private static final String MODEL_QUERY_SET = "icons/facetSet.png"; //$NON-NLS-1$

 	private static final String MODEL_QUERY = "icons/facet.png"; //$NON-NLS-1$

diff --git a/org.eclipse.gmt.modisco.infra.facet.ui/src/org/eclipse/gmt/modisco/infra/facet/ui/Messages.java b/org.eclipse.gmt.modisco.infra.facet.ui/src/org/eclipse/gmt/modisco/infra/facet/ui/Messages.java
index 2ef5e95..c2d2079 100644
--- a/org.eclipse.gmt.modisco.infra.facet.ui/src/org/eclipse/gmt/modisco/infra/facet/ui/Messages.java
+++ b/org.eclipse.gmt.modisco.infra.facet.ui/src/org/eclipse/gmt/modisco/infra/facet/ui/Messages.java
@@ -15,8 +15,9 @@
 

 /**

  * @author gdupe

- * 

+ * @deprecated Replaced by EMF Facet

  */

+@Deprecated

 public final class Messages extends NLS {

 	private static final String BUNDLE_NAME = "org.eclipse.gmt.modisco.infra.facet.ui.messages"; //$NON-NLS-1$

 	public static String FacetView_0;

diff --git a/org.eclipse.gmt.modisco.infra.facet.ui/src/org/eclipse/gmt/modisco/infra/facet/ui/views/FacetSetContentProvider.java b/org.eclipse.gmt.modisco.infra.facet.ui/src/org/eclipse/gmt/modisco/infra/facet/ui/views/FacetSetContentProvider.java
index 6ef4889..73cb0ba 100644
--- a/org.eclipse.gmt.modisco.infra.facet.ui/src/org/eclipse/gmt/modisco/infra/facet/ui/views/FacetSetContentProvider.java
+++ b/org.eclipse.gmt.modisco.infra.facet.ui/src/org/eclipse/gmt/modisco/infra/facet/ui/views/FacetSetContentProvider.java
@@ -20,8 +20,9 @@
 

 /**

  * @author gdupe

- * 

+ * @deprecated Replaced by EMF Facet

  */

+@Deprecated

 public class FacetSetContentProvider implements ITreeContentProvider {

 

 	private EClass depth;

diff --git a/org.eclipse.gmt.modisco.infra.facet.ui/src/org/eclipse/gmt/modisco/infra/facet/ui/views/FacetView.java b/org.eclipse.gmt.modisco.infra.facet.ui/src/org/eclipse/gmt/modisco/infra/facet/ui/views/FacetView.java
index e256d4b..1f3d1c6 100644
--- a/org.eclipse.gmt.modisco.infra.facet.ui/src/org/eclipse/gmt/modisco/infra/facet/ui/views/FacetView.java
+++ b/org.eclipse.gmt.modisco.infra.facet.ui/src/org/eclipse/gmt/modisco/infra/facet/ui/views/FacetView.java
@@ -43,7 +43,9 @@
 /**

  * An Eclipse view that displays a list of available MoDisco facet sets.

  * Clicking on a facet set opens it in the facet set editor.

+ * @deprecated Replaced by EMF Facet

  */

+@Deprecated

 public class FacetView extends AbstractTreeView implements ModiscoCatalogChangeListener {

 

 	private static final String NAME_COLUMN = "FacetView_NameColumn"; //$NON-NLS-1$

diff --git a/org.eclipse.gmt.modisco.infra.facet/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.facet/META-INF/MANIFEST.MF
index ec859a3..a729999 100644
--- a/org.eclipse.gmt.modisco.infra.facet/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.facet/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %pluginName

 Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.facet;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-ClassPath: .

 Bundle-Vendor: %providerName

 Bundle-Localization: plugin

diff --git a/org.eclipse.gmt.modisco.infra.facet/plugin.properties b/org.eclipse.gmt.modisco.infra.facet/plugin.properties
index 9a7f384..35b30ab 100644
--- a/org.eclipse.gmt.modisco.infra.facet/plugin.properties
+++ b/org.eclipse.gmt.modisco.infra.facet/plugin.properties
@@ -8,7 +8,7 @@
 # Contributors:

 #    Gregoire DUPE (Mia-Software) - initial API and implementation

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

-pluginName = MoDisco Facet Meta Model Implementation (Incubation)

+pluginName = MoDisco Facet Meta Model Implementation (Deprecated, will be replaced by EMF Facet) (Incubation)

 providerName = Eclipse Modeling Project

 

 category.name = MoDisco Facet Constraints

diff --git a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/Facet.java b/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/Facet.java
index af1a04d..24f5a8f 100644
--- a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/Facet.java
+++ b/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/Facet.java
@@ -42,7 +42,9 @@
  * @see org.eclipse.gmt.modisco.infra.facet.FacetPackage#getFacet()

  * @model

  * @generated

+ * @deprecated Replaced by EMF Facet

  */

+@Deprecated

 public interface Facet extends EClass {

 	/**

 	 * Returns the value of the '<em><b>Condition Query</b></em>' reference.

diff --git a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/FacetAttribute.java b/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/FacetAttribute.java
index ae8368d..5ff438a 100644
--- a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/FacetAttribute.java
+++ b/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/FacetAttribute.java
@@ -29,6 +29,8 @@
  * @see org.eclipse.gmt.modisco.infra.facet.FacetPackage#getFacetAttribute()

  * @model

  * @generated

+ * @deprecated Replaced by EMF Facet

  */

+@Deprecated

 public interface FacetAttribute extends EAttribute, FacetStructuralFeature {

 } // FacetAttribute

diff --git a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/FacetFactory.java b/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/FacetFactory.java
index d28c73e..d897d98 100644
--- a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/FacetFactory.java
+++ b/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/FacetFactory.java
@@ -23,7 +23,9 @@
  * <!-- end-user-doc -->

  * @see org.eclipse.gmt.modisco.infra.facet.FacetPackage

  * @generated

+ * @deprecated Replaced by EMF Facet

  */

+@Deprecated

 public interface FacetFactory extends EFactory {

 	/**

 	 * The singleton instance of the factory.

diff --git a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/FacetPackage.java b/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/FacetPackage.java
index 5407557..11f99d3 100644
--- a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/FacetPackage.java
+++ b/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/FacetPackage.java
@@ -33,7 +33,9 @@
  * @see org.eclipse.gmt.modisco.infra.facet.FacetFactory

  * @model kind="package"

  * @generated

+ * @deprecated Replaced by EMF Facet

  */

+@Deprecated

 public interface FacetPackage extends EPackage {

 	/**

 	 * The package name.

@@ -1319,7 +1321,9 @@
 	 * </ul>

 	 * <!-- end-user-doc -->

 	 * @generated

+	 * @deprecated Replaced by EMF Facet

 	 */

+	@Deprecated

 	interface Literals {

 		/**

 		 * The meta object literal for the '{@link org.eclipse.gmt.modisco.infra.facet.impl.FacetImpl <em>Facet</em>}' class.

diff --git a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/FacetReference.java b/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/FacetReference.java
index 97940ce..512cd65 100644
--- a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/FacetReference.java
+++ b/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/FacetReference.java
@@ -29,6 +29,8 @@
  * @see org.eclipse.gmt.modisco.infra.facet.FacetPackage#getFacetReference()

  * @model

  * @generated

+ * @deprecated Replaced by EMF Facet

  */

+@Deprecated

 public interface FacetReference extends EReference, FacetStructuralFeature {

 } // FacetReference

diff --git a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/FacetSet.java b/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/FacetSet.java
index a842cb0..56c2b99 100644
--- a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/FacetSet.java
+++ b/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/FacetSet.java
@@ -33,7 +33,9 @@
  * @see org.eclipse.gmt.modisco.infra.facet.FacetPackage#getFacetSet()

  * @model

  * @generated

+ * @deprecated Replaced by EMF Facet

  */

+@Deprecated

 public interface FacetSet extends EPackage {

 	/**

 	 * Returns the value of the '<em><b>Extended Package</b></em>' reference.

diff --git a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/FacetStructuralFeature.java b/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/FacetStructuralFeature.java
index 6b9b847..14c74cc 100644
--- a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/FacetStructuralFeature.java
+++ b/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/FacetStructuralFeature.java
@@ -15,7 +15,6 @@
 package org.eclipse.gmt.modisco.infra.facet;

 

 import org.eclipse.emf.ecore.EObject;

-

 import org.eclipse.gmt.modisco.infra.query.ModelQuery;

 

 /**

@@ -33,7 +32,9 @@
  * @see org.eclipse.gmt.modisco.infra.facet.FacetPackage#getFacetStructuralFeature()

  * @model abstract="true"

  * @generated

+ * @deprecated Replaced by EMF Facet

  */

+@Deprecated

 public interface FacetStructuralFeature extends EObject {

 	/**

 	 * Returns the value of the '<em><b>Value Query</b></em>' reference.

diff --git a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/Shortcut.java b/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/Shortcut.java
index fa64f24..893c10a 100644
--- a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/Shortcut.java
+++ b/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/Shortcut.java
@@ -15,7 +15,6 @@
 package org.eclipse.gmt.modisco.infra.facet;

 

 import org.eclipse.emf.common.util.EList;

-

 import org.eclipse.emf.ecore.EReference;

 

 /**

@@ -34,7 +33,9 @@
  * @see org.eclipse.gmt.modisco.infra.facet.FacetPackage#getShortcut()

  * @model

  * @generated

+ * @deprecated Replaced by EMF Facet

  */

+@Deprecated

 public interface Shortcut extends EReference {

 	/**

 	 * Returns the value of the '<em><b>Path</b></em>' reference list.

diff --git a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/impl/FacetAttributeImpl.java b/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/impl/FacetAttributeImpl.java
index eae5634..17818aa 100644
--- a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/impl/FacetAttributeImpl.java
+++ b/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/impl/FacetAttributeImpl.java
@@ -15,10 +15,8 @@
 package org.eclipse.gmt.modisco.infra.facet.impl;

 

 import org.eclipse.emf.common.notify.Notification;

-

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

-

 import org.eclipse.emf.ecore.impl.EAttributeImpl;

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 

@@ -40,7 +38,9 @@
  * </p>

  *

  * @generated

+ * @deprecated Replaced by EMF Facet

  */

+@Deprecated

 public class FacetAttributeImpl extends EAttributeImpl implements FacetAttribute {

 	/**

 	 * The cached value of the '{@link #getValueQuery() <em>Value Query</em>}' reference.

diff --git a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/impl/FacetFactoryImpl.java b/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/impl/FacetFactoryImpl.java
index 4b9b102..17f8550 100644
--- a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/impl/FacetFactoryImpl.java
+++ b/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/impl/FacetFactoryImpl.java
@@ -26,7 +26,9 @@
  * An implementation of the model <b>Factory</b>.

  * <!-- end-user-doc -->

  * @generated

+ * @deprecated Replaced by EMF Facet

  */

+@Deprecated

 public class FacetFactoryImpl extends EFactoryImpl implements FacetFactory {

 	/**

 	 * Creates the default factory implementation.

diff --git a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/impl/FacetImpl.java b/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/impl/FacetImpl.java
index a3ad45b..49943f7 100644
--- a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/impl/FacetImpl.java
+++ b/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/impl/FacetImpl.java
@@ -37,7 +37,9 @@
  * </p>

  *

  * @generated

+ * @deprecated Replaced by EMF Facet

  */

+@Deprecated

 public class FacetImpl extends EClassImpl implements Facet {

 	/**

 	 * The cached value of the '{@link #getConditionQuery() <em>Condition Query</em>}' reference.

diff --git a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/impl/FacetPackageImpl.java b/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/impl/FacetPackageImpl.java
index a87fe0e..7932cd7 100644
--- a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/impl/FacetPackageImpl.java
+++ b/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/impl/FacetPackageImpl.java
@@ -35,7 +35,9 @@
  * An implementation of the model <b>Package</b>.

  * <!-- end-user-doc -->

  * @generated

+ * @deprecated Replaced by EMF Facet

  */

+@Deprecated

 public class FacetPackageImpl extends EPackageImpl implements FacetPackage {

 	/**

 	 * <!-- begin-user-doc -->

diff --git a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/impl/FacetReferenceImpl.java b/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/impl/FacetReferenceImpl.java
index 786b121..e458c63 100644
--- a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/impl/FacetReferenceImpl.java
+++ b/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/impl/FacetReferenceImpl.java
@@ -15,10 +15,8 @@
 package org.eclipse.gmt.modisco.infra.facet.impl;

 

 import org.eclipse.emf.common.notify.Notification;

-

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

-

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 import org.eclipse.emf.ecore.impl.EReferenceImpl;

 

@@ -40,7 +38,9 @@
  * </p>

  *

  * @generated

+ * @deprecated Replaced by EMF Facet

  */

+@Deprecated

 public class FacetReferenceImpl extends EReferenceImpl implements FacetReference {

 	/**

 	 * The cached value of the '{@link #getValueQuery() <em>Value Query</em>}' reference.

diff --git a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/impl/FacetSetImpl.java b/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/impl/FacetSetImpl.java
index 380df01..6df753f 100644
--- a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/impl/FacetSetImpl.java
+++ b/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/impl/FacetSetImpl.java
@@ -43,7 +43,9 @@
  * </p>

  *

  * @generated

+ * @deprecated Replaced by EMF Facet

  */

+@Deprecated

 public class FacetSetImpl extends EPackageImpl implements FacetSet {

 	/**

 	 * The cached value of the '{@link #getExtendedPackage() <em>Extended Package</em>}' reference.

diff --git a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/impl/FacetStructuralFeatureImpl.java b/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/impl/FacetStructuralFeatureImpl.java
index 7b2b28f..a59d9e7 100644
--- a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/impl/FacetStructuralFeatureImpl.java
+++ b/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/impl/FacetStructuralFeatureImpl.java
@@ -15,10 +15,8 @@
 package org.eclipse.gmt.modisco.infra.facet.impl;

 

 import org.eclipse.emf.common.notify.Notification;

-

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

-

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 import org.eclipse.emf.ecore.impl.EObjectImpl;

 

@@ -39,7 +37,9 @@
  * </p>

  *

  * @generated

+ * @deprecated Replaced by EMF Facet

  */

+@Deprecated

 public abstract class FacetStructuralFeatureImpl extends EObjectImpl implements FacetStructuralFeature {

 	/**

 	 * The cached value of the '{@link #getValueQuery() <em>Value Query</em>}' reference.

diff --git a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/impl/ShortcutImpl.java b/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/impl/ShortcutImpl.java
index 0b21dc7..998db72 100644
--- a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/impl/ShortcutImpl.java
+++ b/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/impl/ShortcutImpl.java
@@ -40,7 +40,9 @@
  * </p>

  *

  * @generated

+ * @deprecated Replaced by EMF Facet

  */

+@Deprecated

 public class ShortcutImpl extends EReferenceImpl implements Shortcut {

 	/**

 	 * The cached value of the '{@link #getPath() <em>Path</em>}' reference list.

diff --git a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/plugin/FacetPlugin.java b/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/plugin/FacetPlugin.java
index 7e4209c..14ac811 100644
--- a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/plugin/FacetPlugin.java
+++ b/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/plugin/FacetPlugin.java
@@ -15,7 +15,9 @@
 

 /**

  * The activator class controls the plug-in life cycle

+ * @deprecated Replaced by EMF Facet

  */

+@Deprecated

 public class FacetPlugin extends Plugin {

 

 	// The plug-in ID

diff --git a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/util/FacetAdapterFactory.java b/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/util/FacetAdapterFactory.java
index 14a73e6..73ac427 100644
--- a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/util/FacetAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/util/FacetAdapterFactory.java
@@ -36,7 +36,9 @@
  * <!-- end-user-doc -->

  * @see org.eclipse.gmt.modisco.infra.facet.FacetPackage

  * @generated

+ * @deprecated Replaced by EMF Facet

  */

+@Deprecated

 public class FacetAdapterFactory extends AdapterFactoryImpl {

 	/**

 	 * The cached model package.

diff --git a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/util/FacetSwitch.java b/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/util/FacetSwitch.java
index f3c4fbe..64a43a8 100644
--- a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/util/FacetSwitch.java
+++ b/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/util/FacetSwitch.java
@@ -26,7 +26,6 @@
 import org.eclipse.emf.ecore.EReference;

 import org.eclipse.emf.ecore.EStructuralFeature;

 import org.eclipse.emf.ecore.ETypedElement;

-

 import org.eclipse.gmt.modisco.infra.facet.*;

 

 /**

@@ -41,7 +40,9 @@
  * <!-- end-user-doc -->

  * @see org.eclipse.gmt.modisco.infra.facet.FacetPackage

  * @generated

+ * @deprecated Replaced by EMF Facet

  */

+@Deprecated

 public class FacetSwitch<T> {

 	/**

 	 * The cached model package

diff --git a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/validation/EValidatorAdapter.java b/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/validation/EValidatorAdapter.java
index 8a6cf01..14f364e 100644
--- a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/validation/EValidatorAdapter.java
+++ b/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/validation/EValidatorAdapter.java
@@ -29,7 +29,9 @@
  * This class has been written using the "Tutorial: EMF Validation Adapter"

  * documentation ({@link

  * /org.eclipse.emf.validation.doc/tutorials/validationAdapterTutorial.html})

+ * @deprecated Replaced by EMF Facet

  */

+@Deprecated

 public class EValidatorAdapter extends EObjectValidator {

 

 	private final IBatchValidator batchValidator;

diff --git a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/validation/ExtendedClassValidation.java b/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/validation/ExtendedClassValidation.java
index bd4df17..0eb2f23 100644
--- a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/validation/ExtendedClassValidation.java
+++ b/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/validation/ExtendedClassValidation.java
@@ -25,6 +25,11 @@
 import org.eclipse.gmt.modisco.infra.facet.FacetSet;

 import org.eclipse.gmt.modisco.infra.facet.plugin.FacetPlugin;

 

+/**

+ * 

+ * @deprecated Replaced by EMF Facet

+ */

+@Deprecated

 public class ExtendedClassValidation extends AbstractModelConstraint {

 

 	@Override

diff --git a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/validation/FacetSetName.java b/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/validation/FacetSetName.java
index 0808bc2..efa3dbc 100644
--- a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/validation/FacetSetName.java
+++ b/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/validation/FacetSetName.java
@@ -16,6 +16,10 @@
 import org.eclipse.emf.validation.IValidationContext;

 import org.eclipse.gmt.modisco.infra.facet.FacetSet;

 

+/**

+ * @deprecated Replaced by EMF Facet

+ */

+@Deprecated

 public class FacetSetName extends AbstractModelConstraint {

 

 	@Override

diff --git a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/validation/FacetSetRoot.java b/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/validation/FacetSetRoot.java
index 7c5c63b..55532ef 100644
--- a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/validation/FacetSetRoot.java
+++ b/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/validation/FacetSetRoot.java
@@ -17,6 +17,10 @@
 import org.eclipse.emf.validation.IValidationContext;

 import org.eclipse.gmt.modisco.infra.facet.FacetSet;

 

+/**

+ * @deprecated Replaced by EMF Facet

+ */

+@Deprecated

 public class FacetSetRoot extends AbstractModelConstraint {

 

 	@Override

diff --git a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/validation/NonEmptyName.java b/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/validation/NonEmptyName.java
index 77f4dc4..1b7481a 100644
--- a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/validation/NonEmptyName.java
+++ b/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/validation/NonEmptyName.java
@@ -19,6 +19,10 @@
 import org.eclipse.gmt.modisco.infra.facet.Facet;

 import org.eclipse.gmt.modisco.infra.facet.FacetSet;

 

+/**

+ * @deprecated Replaced by EMF Facet

+ */

+@Deprecated

 public class NonEmptyName extends AbstractModelConstraint {

 

 	@Override

diff --git a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/validation/UniqueName.java b/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/validation/UniqueName.java
index 6a32250..dc02ae6 100644
--- a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/validation/UniqueName.java
+++ b/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/validation/UniqueName.java
@@ -19,6 +19,10 @@
 import org.eclipse.emf.validation.IValidationContext;

 import org.eclipse.gmt.modisco.infra.facet.FacetSet;

 

+/**

+ * @deprecated Replaced by EMF Facet

+ */

+@Deprecated

 public class UniqueName extends AbstractModelConstraint {

 

 	@Override

diff --git a/org.eclipse.gmt.modisco.infra.prefuse/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.prefuse/META-INF/MANIFEST.MF
index 72318ab..b93c90f 100644
--- a/org.eclipse.gmt.modisco.infra.prefuse/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.prefuse/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.prefuse;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.gmt.modisco.infra.prefuse.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/Activator.java b/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/Activator.java
index f17e728..b4b9e06 100644
--- a/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/Activator.java
+++ b/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/Activator.java
@@ -17,7 +17,9 @@
 

 /**

  * The activator class controls the plug-in life cycle

+ * @deprecated Will become internal cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470609

  */

+@Deprecated

 public class Activator extends AbstractUIPlugin {

 

 	// The plug-in ID

diff --git a/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/Messages.java b/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/Messages.java
index 4acabd9..6a2f08e 100644
--- a/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/Messages.java
+++ b/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/Messages.java
@@ -14,8 +14,10 @@
 

 /**

  * @author GBarbier

- *

+ * @deprecated Will be removed,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470701

  */

+@Deprecated

 public class Messages extends NLS {

 	private static final String BUNDLE_NAME = "org.eclipse.gmt.modisco.infra.prefuse.messages"; //$NON-NLS-1$

 	public static String PrefuseGraphContainer_BalancedTree;

diff --git a/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/graphview/Messages.java b/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/graphview/Messages.java
index 80c9dfa..8d88e17 100644
--- a/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/graphview/Messages.java
+++ b/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/graphview/Messages.java
@@ -14,8 +14,10 @@
 

 /**

  * @author GBarbier

- *

+ * @deprecated Will be removed,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470701

  */

+@Deprecated

 public class Messages extends NLS {

 	private static final String BUNDLE_NAME = "org.eclipse.gmt.modisco.infra.prefuse.examples.graphview.messages"; //$NON-NLS-1$

 	public static String GraphViewUtils_BalancedTree;

diff --git a/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/treeview/Messages.java b/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/treeview/Messages.java
index defba57..0d6fc39 100644
--- a/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/treeview/Messages.java
+++ b/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/treeview/Messages.java
@@ -14,8 +14,10 @@
 

 /**

  * @author GBarbier

- *

+ * @deprecated Will be removed,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470701

  */

+@Deprecated

 public class Messages extends NLS {

 	private static final String BUNDLE_NAME = "org.eclipse.gmt.modisco.infra.prefuse.examples.treeview.messages"; //$NON-NLS-1$

 	public static String TreeView_UnrecognizedOrientationValue;

diff --git a/org.eclipse.gmt.modisco.infra.query.core/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.query.core/META-INF/MANIFEST.MF
index ed3442a..b639312 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.query.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.query.core;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.gmt.modisco.infra.query.core.internal.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.gmt.modisco.infra.query.core/OSGI-INF/l10n/bundle.properties b/org.eclipse.gmt.modisco.infra.query.core/OSGI-INF/l10n/bundle.properties
index 289f2f2..64d6c8e 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.gmt.modisco.infra.query.core/OSGI-INF/l10n/bundle.properties
@@ -13,7 +13,7 @@
 extension-point.name = org.eclipse.gmt.modisco.infra.query.registration

 extension-point.name.0 = org.eclipse.gmt.modisco.infra.query.factory

 Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = MoDisco Query Core (Incubation)

+Bundle-Name = MoDisco Query Core (Deprecated, has to be replaced by EMF Facet) (Incubation)

 extension-point.name.1 = org.eclipse.gmt.modisco.infra.query.registration

 extension-point.name.2 = org.eclipse.gmt.modisco.infra.query.factory

 constraint.description = All items must be named.

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/AbstractModelQuery.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/AbstractModelQuery.java
index c00a642..4cd8562 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/AbstractModelQuery.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/AbstractModelQuery.java
@@ -43,7 +43,9 @@
  * 

  * @author Gregoire DUPE (Mia-Software)

  * 

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public abstract class AbstractModelQuery {

 

 	private final ModelQuery modelQuery;

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/IModelQueryFactory.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/IModelQueryFactory.java
index e416b45..47d0e55 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/IModelQueryFactory.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/IModelQueryFactory.java
@@ -15,6 +15,10 @@
 import org.eclipse.gmt.modisco.infra.query.core.exception.ModelQueryException;

 import org.osgi.framework.Bundle;

 

+/*

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

+ */

+@Deprecated

 public interface IModelQueryFactory {

 	public AbstractModelQuery create(ModelQuery modelQuery, Bundle bundle)

 			throws ModelQueryException;

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/IModelQueryTooltip.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/IModelQueryTooltip.java
index 9c8a39b..70bc6b5 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/IModelQueryTooltip.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/IModelQueryTooltip.java
@@ -17,7 +17,9 @@
 /**

  * Implement this interface if you want to customize the tooltip that is shown

  * for a specific kind of queries.

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public interface IModelQueryTooltip {

 	/**

 	 * Set the tooltip text into the {@link StyledText} component.

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/IQuerySetProvider.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/IQuerySetProvider.java
index 80330d5..5a9099e 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/IQuerySetProvider.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/IQuerySetProvider.java
@@ -15,6 +15,10 @@
 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gmt.modisco.infra.query.ModelQuerySet;

 

+/**

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

+ */

+@Deprecated

 public interface IQuerySetProvider {

 	Collection<ModelQuerySet> getQuerySets(Collection<? extends EObject> context);

 }

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/ModelQuerySetCatalog.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/ModelQuerySetCatalog.java
index dcf5bbf..7914ba1 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/ModelQuerySetCatalog.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/ModelQuerySetCatalog.java
@@ -33,6 +33,10 @@
 import org.eclipse.gmt.modisco.infra.query.core.internal.validation.EValidatorAdapter;

 import org.osgi.framework.Bundle;

 

+/**

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

+ */

+@Deprecated

 public final class ModelQuerySetCatalog extends AbstractMoDiscoCatalog {

 

 	public static final String REGISTRATION_EXTENSION_POINT_ID = "org.eclipse.gmt.modisco.infra.query.registration"; //$NON-NLS-1$

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/exception/BundleClassPathException.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/exception/BundleClassPathException.java
index ef6c09d..e12f742 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/exception/BundleClassPathException.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/exception/BundleClassPathException.java
@@ -14,6 +14,10 @@
 import org.eclipse.core.runtime.IPath;

 import org.osgi.framework.Bundle;

 

+/**

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

+ */

+@Deprecated

 public class BundleClassPathException extends ModelQueryException {

 

 	private static final long serialVersionUID = 8664502897169666916L;

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/exception/ExecutionEnvironmentException.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/exception/ExecutionEnvironmentException.java
index 001d18a..be83685 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/exception/ExecutionEnvironmentException.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/exception/ExecutionEnvironmentException.java
@@ -10,6 +10,10 @@
  *******************************************************************************/

 package org.eclipse.gmt.modisco.infra.query.core.exception;

 

+/**

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

+ */

+@Deprecated

 public class ExecutionEnvironmentException extends ModelQueryException {

 

 	private static final long serialVersionUID = -1902759878640028259L;

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/exception/MissingBundleException.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/exception/MissingBundleException.java
index 9634f18..75dd255 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/exception/MissingBundleException.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/exception/MissingBundleException.java
@@ -10,6 +10,10 @@
  *******************************************************************************/

 package org.eclipse.gmt.modisco.infra.query.core.exception;

 

+/**

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

+ */

+@Deprecated

 public class MissingBundleException extends ModelQueryException {

 

 	private static final long serialVersionUID = -8404816241040395882L;

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/exception/ModelQueryException.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/exception/ModelQueryException.java
index 27d6669..612c225 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/exception/ModelQueryException.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/exception/ModelQueryException.java
@@ -10,6 +10,10 @@
  */

 package org.eclipse.gmt.modisco.infra.query.core.exception;

 

+/**

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

+ */

+@Deprecated

 public class ModelQueryException extends Exception {

 

 	private static final long serialVersionUID = -3203874059325745157L;

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/exception/ModelQueryExecutionException.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/exception/ModelQueryExecutionException.java
index 2c0c2b4..a58df7e 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/exception/ModelQueryExecutionException.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/exception/ModelQueryExecutionException.java
@@ -10,6 +10,10 @@
  */

 package org.eclipse.gmt.modisco.infra.query.core.exception;

 

+/**

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

+ */

+@Deprecated

 public class ModelQueryExecutionException extends ModelQueryException {

 

 	private static final long serialVersionUID = -8464252257666617685L;

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/exception/ModelQueryTypeCheckingException.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/exception/ModelQueryTypeCheckingException.java
index 77d102c..a01bd9a 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/exception/ModelQueryTypeCheckingException.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/exception/ModelQueryTypeCheckingException.java
@@ -10,6 +10,10 @@
  */

 package org.eclipse.gmt.modisco.infra.query.core.exception;

 

+/**

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

+ */

+@Deprecated

 public class ModelQueryTypeCheckingException extends ModelQueryException {

 

 	private static final long serialVersionUID = -9064274334817642819L;

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/exception/ProjectDisabledException.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/exception/ProjectDisabledException.java
index 241750a..4c0725d 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/exception/ProjectDisabledException.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/exception/ProjectDisabledException.java
@@ -10,6 +10,10 @@
  *******************************************************************************/

 package org.eclipse.gmt.modisco.infra.query.core.exception;

 

+/**

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

+ */

+@Deprecated

 public class ProjectDisabledException extends ModelQueryException {

 

 

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/Activator.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/Activator.java
index dcff55a0..e6bf5cd 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/Activator.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/Activator.java
@@ -24,7 +24,9 @@
 

 /**

  * The activator class controls the plug-in life cycle

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public class Activator extends Plugin {

 

 	// The plug-in ID

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/Messages.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/Messages.java
index 47a23cf..d4f8cba 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/Messages.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/Messages.java
@@ -12,6 +12,10 @@
 

 import org.eclipse.osgi.util.NLS;

 

+/*

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

+ */

+@Deprecated

 public class Messages extends NLS {

 	private static final String BUNDLE_NAME = "org.eclipse.gmt.modisco.infra.query.core.internal.messages"; //$NON-NLS-1$

 	public static String ImplementationClassInterface_logErrorsJobName;

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/QueryBuilder.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/QueryBuilder.java
index ea57481..94ff8ee 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/QueryBuilder.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/QueryBuilder.java
@@ -16,6 +16,10 @@
 import org.eclipse.gmt.modisco.infra.common.core.internal.builder.MoDiscoCatalogBuilder;

 import org.eclipse.gmt.modisco.infra.query.core.ModelQuerySetCatalog;

 

+/**

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

+ */

+@Deprecated

 public class QueryBuilder extends MoDiscoCatalogBuilder {

 

 	protected static final String FILE_EXTENSION = "querySet"; //$NON-NLS-1$

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/QueryProtocolExtension.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/QueryProtocolExtension.java
index 810d85a..fa0b3a6 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/QueryProtocolExtension.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/QueryProtocolExtension.java
@@ -14,6 +14,10 @@
 import org.eclipse.gmt.modisco.infra.common.core.internal.protocol.IModiscoProtocolExtension;

 import org.eclipse.gmt.modisco.infra.query.core.ModelQuerySetCatalog;

 

+/**

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

+ */

+@Deprecated

 public class QueryProtocolExtension implements IModiscoProtocolExtension {

 

 	/*

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/ReferedFileHandler.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/ReferedFileHandler.java
index 1648c94..ce855b0 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/ReferedFileHandler.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/ReferedFileHandler.java
@@ -32,7 +32,9 @@
  * attribute.

  * 

  * @author Gregoire DUPE (Mia-Software)

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public final class ReferedFileHandler {

 

 	private Bundle bundle;

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/utils/QueryUtils.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/utils/QueryUtils.java
index fbeeffe..e6955da 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/utils/QueryUtils.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/utils/QueryUtils.java
@@ -10,6 +10,10 @@
  *******************************************************************************/

 package org.eclipse.gmt.modisco.infra.query.core.internal.utils;

 

+/**

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

+ */

+@Deprecated

 public final class QueryUtils {

 	private QueryUtils() {

 		// not instantiable

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/EValidatorAdapter.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/EValidatorAdapter.java
index 642ebd6..3d5d1f3 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/EValidatorAdapter.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/EValidatorAdapter.java
@@ -29,7 +29,9 @@
  * This class has been written using the "Tutorial: EMF Validation Adapter"

  * documentation ({@link

  * /org.eclipse.emf.validation.doc/tutorials/validationAdapterTutorial.html})

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public class EValidatorAdapter extends EObjectValidator {

 

 	private final IBatchValidator batchValidator;

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/ImplementationClassInterface.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/ImplementationClassInterface.java
index 12f0151..a48e991 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/ImplementationClassInterface.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/ImplementationClassInterface.java
@@ -47,6 +47,10 @@
 import org.eclipse.osgi.util.NLS;

 import org.osgi.framework.Bundle;

 

+/**

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

+ */

+@Deprecated

 public class ImplementationClassInterface extends AbstractModelConstraint {

 

 	private class UnresolvedType extends Exception {

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/ImplementationClassName.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/ImplementationClassName.java
index ed26b0f..10c76aa 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/ImplementationClassName.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/ImplementationClassName.java
@@ -34,7 +34,11 @@
 import org.eclipse.osgi.util.NLS;

 import org.osgi.framework.Bundle;

 

-/** Check that the implementation class exists and has no compilation errors. */

+/**

+ * Check that the implementation class exists and has no compilation errors.

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

+ */

+@Deprecated

 public class ImplementationClassName extends AbstractModelConstraint {

 

 	@Override

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/ModelQuerySetName.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/ModelQuerySetName.java
index e67f419..210f691 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/ModelQuerySetName.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/ModelQuerySetName.java
@@ -16,6 +16,10 @@
 import org.eclipse.emf.validation.IValidationContext;

 import org.eclipse.gmt.modisco.infra.query.ModelQuerySet;

 

+/**

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

+ */

+@Deprecated

 public class ModelQuerySetName extends AbstractModelConstraint {

 

 	@Override

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/ModelQuerySetRoot.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/ModelQuerySetRoot.java
index 836a395..2a9158f 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/ModelQuerySetRoot.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/ModelQuerySetRoot.java
@@ -16,6 +16,10 @@
 import org.eclipse.emf.validation.EMFEventType;

 import org.eclipse.emf.validation.IValidationContext;

 

+/**

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

+ */

+@Deprecated

 public class ModelQuerySetRoot extends AbstractModelConstraint {

 

 	@Override

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/NonEmptyName.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/NonEmptyName.java
index 9bd1abe..6cacaa7 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/NonEmptyName.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/NonEmptyName.java
@@ -19,6 +19,10 @@
 import org.eclipse.gmt.modisco.infra.query.ModelQueryParameter;

 import org.eclipse.gmt.modisco.infra.query.ModelQuerySet;

 

+/**

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

+ */

+@Deprecated

 public class NonEmptyName extends AbstractModelConstraint {

 

 	@Override

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/ParameterUniqueName.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/ParameterUniqueName.java
index d72dfdf..53ce006 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/ParameterUniqueName.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/ParameterUniqueName.java
@@ -19,6 +19,10 @@
 import org.eclipse.gmt.modisco.infra.query.ModelQuery;

 import org.eclipse.gmt.modisco.infra.query.ModelQueryParameter;

 

+/**

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

+ */

+@Deprecated

 public class ParameterUniqueName extends AbstractModelConstraint {

 

 	@Override

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/ReturnTypeValidation.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/ReturnTypeValidation.java
index 4c94b09..0a373dd 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/ReturnTypeValidation.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/ReturnTypeValidation.java
@@ -27,6 +27,10 @@
 import org.eclipse.gmt.modisco.infra.query.core.internal.Activator;

 import org.eclipse.osgi.util.NLS;

 

+/**

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

+ */

+@Deprecated

 public class ReturnTypeValidation extends AbstractModelConstraint {

 

 	@Override

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/ScopeValidation.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/ScopeValidation.java
index 034014b..eb724aa 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/ScopeValidation.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/ScopeValidation.java
@@ -23,6 +23,10 @@
 import org.eclipse.gmt.modisco.infra.query.ModelQuery;

 import org.eclipse.gmt.modisco.infra.query.core.internal.Activator;

 

+/**

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

+ */

+@Deprecated

 public class ScopeValidation extends AbstractModelConstraint {

 

 	@Override

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/UniqueName.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/UniqueName.java
index e29f901..6cbb714 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/UniqueName.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/UniqueName.java
@@ -19,6 +19,10 @@
 import org.eclipse.gmt.modisco.infra.query.ModelQuery;

 import org.eclipse.gmt.modisco.infra.query.ModelQuerySet;

 

+/**

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

+ */

+@Deprecated

 public class UniqueName extends AbstractModelConstraint {

 

 	@Override

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/java/IJavaModelQuery.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/java/IJavaModelQuery.java
index a4ca65f..2a15c79 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/java/IJavaModelQuery.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/java/IJavaModelQuery.java
@@ -19,7 +19,9 @@
  *            the context type

  * @param <R>

  *            the return type

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public interface IJavaModelQuery<T extends EObject, R> {

 

 	/**

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/java/ParameterValueList.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/java/ParameterValueList.java
index 8a9cec8..ca284da 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/java/ParameterValueList.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/java/ParameterValueList.java
@@ -21,7 +21,9 @@
 /**

  * List of query parameters, with two method for name direct value / param access. 

  *

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public class ParameterValueList extends ArrayList<ModelQueryParameterValue> {

 

 	/** SERIAL ID */

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/java/internal/JavaModelQueryAdapter.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/java/internal/JavaModelQueryAdapter.java
index 4956317..7cdd9c3 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/java/internal/JavaModelQueryAdapter.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/java/internal/JavaModelQueryAdapter.java
@@ -22,7 +22,9 @@
 

 /**

  * @author Gregoire DUPE (Mia-Software)

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public class JavaModelQueryAdapter extends AbstractModelQuery {

 

 	private final IJavaModelQuery<EObject, ?> javaModelQuery;

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/java/internal/JavaModelQueryFactory.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/java/internal/JavaModelQueryFactory.java
index 60e6aff..8aa916f 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/java/internal/JavaModelQueryFactory.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/java/internal/JavaModelQueryFactory.java
@@ -60,6 +60,10 @@
 import org.osgi.framework.Bundle;

 import org.osgi.framework.BundleException;

 

+/**

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

+ */

+@Deprecated

 public class JavaModelQueryFactory implements IModelQueryFactory {

 

 	private static final long DELAY = 1000;

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/java/internal/JavaQueryImplMarkerChangeListener.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/java/internal/JavaQueryImplMarkerChangeListener.java
index 09ab72f..fb8ff65 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/java/internal/JavaQueryImplMarkerChangeListener.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/java/internal/JavaQueryImplMarkerChangeListener.java
@@ -49,7 +49,9 @@
  * Listens to changes in the workspace and query set catalog, and revalidates

  * the projects containing QuerySets when the Java implementation class

  * referenced by one of their queries is modified.

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public final class JavaQueryImplMarkerChangeListener implements IResourceChangeListener,

 		ModiscoCatalogChangeListener, NonValidFileListener {

 

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/java/internal/JavaValidationQueryBuilder.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/java/internal/JavaValidationQueryBuilder.java
index 2229c75..4b9fa07 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/java/internal/JavaValidationQueryBuilder.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/java/internal/JavaValidationQueryBuilder.java
@@ -31,6 +31,10 @@
 import org.eclipse.gmt.modisco.infra.query.core.ModelQuerySetCatalog;

 import org.eclipse.gmt.modisco.infra.query.core.internal.Activator;

 

+/**

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

+ */

+@Deprecated

 public class JavaValidationQueryBuilder implements IModiscoBuilder {

 

 	public JavaValidationQueryBuilder() {

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/ocl/OCLModelQueryAdapter.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/ocl/OCLModelQueryAdapter.java
index 936a390..a274668 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/ocl/OCLModelQueryAdapter.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/ocl/OCLModelQueryAdapter.java
@@ -32,6 +32,10 @@
 import org.eclipse.ocl.expressions.OCLExpression;

 import org.eclipse.ocl.helper.OCLHelper;

 

+/**

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

+ */

+@Deprecated

 public class OCLModelQueryAdapter extends AbstractModelQuery {

 

 	private OCLExpression<EClassifier> query;

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/ocl/OclModelQueryFactory.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/ocl/OclModelQueryFactory.java
index be2ca9e..9018eb6 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/ocl/OclModelQueryFactory.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/ocl/OclModelQueryFactory.java
@@ -19,6 +19,10 @@
 import org.eclipse.gmt.modisco.infra.query.core.exception.ModelQueryException;

 import org.osgi.framework.Bundle;

 

+/**

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

+ */

+@Deprecated

 public class OclModelQueryFactory implements IModelQueryFactory {

 

 	public AbstractModelQuery create(final ModelQuery modelQuery, final Bundle bundle)

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/propertyTesters/QueryPropertyTester.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/propertyTesters/QueryPropertyTester.java
index 62fc1a8..710c8dc 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/propertyTesters/QueryPropertyTester.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/propertyTesters/QueryPropertyTester.java
@@ -17,6 +17,10 @@
 import org.eclipse.gmt.modisco.infra.query.ModelQuerySet;

 import org.eclipse.gmt.modisco.infra.query.core.ModelQuerySetCatalog;

 

+/**

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

+ */

+@Deprecated

 public class QueryPropertyTester extends PropertyTester {

 

 	public static final String QUERY = "isMoDiscoQuery"; //$NON-NLS-1$

diff --git a/org.eclipse.gmt.modisco.infra.query.edit/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.query.edit/META-INF/MANIFEST.MF
index 10cc515..8b5d147 100644
--- a/org.eclipse.gmt.modisco.infra.query.edit/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.query.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %pluginName

 Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.query.edit;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-ClassPath: .

 Bundle-Activator: org.eclipse.gmt.modisco.infra.query.edit.provider.QueryEditPlugin$Implementation

 Bundle-Vendor: %providerName

diff --git a/org.eclipse.gmt.modisco.infra.query.edit/plugin.properties b/org.eclipse.gmt.modisco.infra.query.edit/plugin.properties
index 20e22c9..b8825fc 100644
--- a/org.eclipse.gmt.modisco.infra.query.edit/plugin.properties
+++ b/org.eclipse.gmt.modisco.infra.query.edit/plugin.properties
@@ -8,7 +8,7 @@
 # Contributors:

 #    Gregoire DUPE (Mia-Software) - initial API and implementation

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

-pluginName = MoDisco Query Edit Support (Incubation)

+pluginName = MoDisco Query Edit Support (Deprecated, has to be replaced by EMF Facet) (Incubation)

 providerName = Eclipse Modeling Project

 

 _UI_CreateChild_text = {0}

diff --git a/org.eclipse.gmt.modisco.infra.query.edit/src/org/eclipse/gmt/modisco/infra/query/edit/provider/JavaModelQueryItemProvider.java b/org.eclipse.gmt.modisco.infra.query.edit/src/org/eclipse/gmt/modisco/infra/query/edit/provider/JavaModelQueryItemProvider.java
index 6a33725..f9e9f1c 100644
--- a/org.eclipse.gmt.modisco.infra.query.edit/src/org/eclipse/gmt/modisco/infra/query/edit/provider/JavaModelQueryItemProvider.java
+++ b/org.eclipse.gmt.modisco.infra.query.edit/src/org/eclipse/gmt/modisco/infra/query/edit/provider/JavaModelQueryItemProvider.java
@@ -20,7 +20,6 @@
 

 import org.eclipse.emf.common.notify.AdapterFactory;

 import org.eclipse.emf.common.notify.Notification;

-

 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

 import org.eclipse.emf.edit.provider.IItemLabelProvider;

@@ -30,7 +29,6 @@
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

 import org.eclipse.emf.edit.provider.ViewerNotification;

-

 import org.eclipse.gmt.modisco.infra.query.JavaModelQuery;

 import org.eclipse.gmt.modisco.infra.query.QueryPackage;

 

@@ -39,7 +37,9 @@
  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

  * @generated

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public class JavaModelQueryItemProvider

 	extends ModelQueryItemProvider

 	implements

diff --git a/org.eclipse.gmt.modisco.infra.query.edit/src/org/eclipse/gmt/modisco/infra/query/edit/provider/ModelQueryItemProvider.java b/org.eclipse.gmt.modisco.infra.query.edit/src/org/eclipse/gmt/modisco/infra/query/edit/provider/ModelQueryItemProvider.java
index 4029df9..827e6c5 100644
--- a/org.eclipse.gmt.modisco.infra.query.edit/src/org/eclipse/gmt/modisco/infra/query/edit/provider/ModelQueryItemProvider.java
+++ b/org.eclipse.gmt.modisco.infra.query.edit/src/org/eclipse/gmt/modisco/infra/query/edit/provider/ModelQueryItemProvider.java
@@ -41,7 +41,9 @@
  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

  * @generated

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public class ModelQueryItemProvider

 	extends ItemProviderAdapter

 	implements

diff --git a/org.eclipse.gmt.modisco.infra.query.edit/src/org/eclipse/gmt/modisco/infra/query/edit/provider/ModelQueryParameterItemProvider.java b/org.eclipse.gmt.modisco.infra.query.edit/src/org/eclipse/gmt/modisco/infra/query/edit/provider/ModelQueryParameterItemProvider.java
index 7970ffa..2954df5 100644
--- a/org.eclipse.gmt.modisco.infra.query.edit/src/org/eclipse/gmt/modisco/infra/query/edit/provider/ModelQueryParameterItemProvider.java
+++ b/org.eclipse.gmt.modisco.infra.query.edit/src/org/eclipse/gmt/modisco/infra/query/edit/provider/ModelQueryParameterItemProvider.java
@@ -20,9 +20,7 @@
 

 import org.eclipse.emf.common.notify.AdapterFactory;

 import org.eclipse.emf.common.notify.Notification;

-

 import org.eclipse.emf.common.util.ResourceLocator;

-

 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

 import org.eclipse.emf.edit.provider.IItemLabelProvider;

@@ -33,7 +31,6 @@
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

 import org.eclipse.emf.edit.provider.ItemProviderAdapter;

 import org.eclipse.emf.edit.provider.ViewerNotification;

-

 import org.eclipse.gmt.modisco.infra.query.ModelQueryParameter;

 import org.eclipse.gmt.modisco.infra.query.QueryPackage;

 

@@ -42,7 +39,9 @@
  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

  * @generated

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public class ModelQueryParameterItemProvider

 	extends ItemProviderAdapter

 	implements

diff --git a/org.eclipse.gmt.modisco.infra.query.edit/src/org/eclipse/gmt/modisco/infra/query/edit/provider/ModelQuerySetItemProvider.java b/org.eclipse.gmt.modisco.infra.query.edit/src/org/eclipse/gmt/modisco/infra/query/edit/provider/ModelQuerySetItemProvider.java
index 0cadc27..e8209b9 100644
--- a/org.eclipse.gmt.modisco.infra.query.edit/src/org/eclipse/gmt/modisco/infra/query/edit/provider/ModelQuerySetItemProvider.java
+++ b/org.eclipse.gmt.modisco.infra.query.edit/src/org/eclipse/gmt/modisco/infra/query/edit/provider/ModelQuerySetItemProvider.java
@@ -42,7 +42,9 @@
  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

  * @generated

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public class ModelQuerySetItemProvider

 	extends ItemProviderAdapter

 	implements

diff --git a/org.eclipse.gmt.modisco.infra.query.edit/src/org/eclipse/gmt/modisco/infra/query/edit/provider/OCLModelQueryItemProvider.java b/org.eclipse.gmt.modisco.infra.query.edit/src/org/eclipse/gmt/modisco/infra/query/edit/provider/OCLModelQueryItemProvider.java
index a0e8d0b..2b24cce 100644
--- a/org.eclipse.gmt.modisco.infra.query.edit/src/org/eclipse/gmt/modisco/infra/query/edit/provider/OCLModelQueryItemProvider.java
+++ b/org.eclipse.gmt.modisco.infra.query.edit/src/org/eclipse/gmt/modisco/infra/query/edit/provider/OCLModelQueryItemProvider.java
@@ -20,7 +20,6 @@
 

 import org.eclipse.emf.common.notify.AdapterFactory;

 import org.eclipse.emf.common.notify.Notification;

-

 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

 import org.eclipse.emf.edit.provider.IItemLabelProvider;

@@ -30,7 +29,6 @@
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;

 import org.eclipse.emf.edit.provider.ViewerNotification;

-

 import org.eclipse.gmt.modisco.infra.query.OCLModelQuery;

 import org.eclipse.gmt.modisco.infra.query.QueryPackage;

 

@@ -39,7 +37,9 @@
  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

  * @generated

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public class OCLModelQueryItemProvider

 	extends ModelQueryItemProvider

 	implements

diff --git a/org.eclipse.gmt.modisco.infra.query.edit/src/org/eclipse/gmt/modisco/infra/query/edit/provider/QueryEditPlugin.java b/org.eclipse.gmt.modisco.infra.query.edit/src/org/eclipse/gmt/modisco/infra/query/edit/provider/QueryEditPlugin.java
index 456a47d..0ae71ab 100644
--- a/org.eclipse.gmt.modisco.infra.query.edit/src/org/eclipse/gmt/modisco/infra/query/edit/provider/QueryEditPlugin.java
+++ b/org.eclipse.gmt.modisco.infra.query.edit/src/org/eclipse/gmt/modisco/infra/query/edit/provider/QueryEditPlugin.java
@@ -23,7 +23,9 @@
  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

  * @generated

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public final class QueryEditPlugin extends EMFPlugin {

 	/**

 	 * Keep track of the singleton.

diff --git a/org.eclipse.gmt.modisco.infra.query.edit/src/org/eclipse/gmt/modisco/infra/query/edit/provider/QueryItemProviderAdapterFactory.java b/org.eclipse.gmt.modisco.infra.query.edit/src/org/eclipse/gmt/modisco/infra/query/edit/provider/QueryItemProviderAdapterFactory.java
index c5c098d..beb60c1 100644
--- a/org.eclipse.gmt.modisco.infra.query.edit/src/org/eclipse/gmt/modisco/infra/query/edit/provider/QueryItemProviderAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.infra.query.edit/src/org/eclipse/gmt/modisco/infra/query/edit/provider/QueryItemProviderAdapterFactory.java
@@ -20,7 +20,6 @@
 import org.eclipse.emf.common.notify.Adapter;

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.common.notify.Notifier;

-

 import org.eclipse.emf.edit.provider.ChangeNotifier;

 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

 import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

@@ -32,7 +31,6 @@
 import org.eclipse.emf.edit.provider.INotifyChangedListener;

 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-

 import org.eclipse.gmt.modisco.infra.query.util.QueryAdapterFactory;

 

 /**

@@ -43,7 +41,9 @@
  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

  * @generated

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public class QueryItemProviderAdapterFactory extends QueryAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {

 	/**

 	 * This keeps track of the root adapter factory that delegates to this adapter factory.

diff --git a/org.eclipse.gmt.modisco.infra.query.editor/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.query.editor/META-INF/MANIFEST.MF
index 7c95674..e846a47 100644
--- a/org.eclipse.gmt.modisco.infra.query.editor/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.query.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %pluginName

 Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.query.editor;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-ClassPath: .

 Bundle-Activator: org.eclipse.gmt.modisco.infra.query.editor.presentation.QueryEditorPlugin$Implementation

 Bundle-Vendor: %providerName

diff --git a/org.eclipse.gmt.modisco.infra.query.editor/plugin.properties b/org.eclipse.gmt.modisco.infra.query.editor/plugin.properties
index 2727998..9bf269e 100644
--- a/org.eclipse.gmt.modisco.infra.query.editor/plugin.properties
+++ b/org.eclipse.gmt.modisco.infra.query.editor/plugin.properties
Binary files differ
diff --git a/org.eclipse.gmt.modisco.infra.query.editor/src/org/eclipse/gmt/modisco/infra/query/editor/Messages.java b/org.eclipse.gmt.modisco.infra.query.editor/src/org/eclipse/gmt/modisco/infra/query/editor/Messages.java
index fe28d7f..b1dbe4f 100644
--- a/org.eclipse.gmt.modisco.infra.query.editor/src/org/eclipse/gmt/modisco/infra/query/editor/Messages.java
+++ b/org.eclipse.gmt.modisco.infra.query.editor/src/org/eclipse/gmt/modisco/infra/query/editor/Messages.java
@@ -13,6 +13,10 @@
 

 import org.eclipse.osgi.util.NLS;

 

+/**

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

+ */

+@Deprecated

 public class Messages extends NLS {

 	private static final String BUNDLE_NAME = "org.eclipse.gmt.modisco.infra.query.editor.messages"; //$NON-NLS-1$

 	public static String QueryActionBarContributor_ShowIn;

diff --git a/org.eclipse.gmt.modisco.infra.query.editor/src/org/eclipse/gmt/modisco/infra/query/editor/presentation/LoadMetaModelResourceAction.java b/org.eclipse.gmt.modisco.infra.query.editor/src/org/eclipse/gmt/modisco/infra/query/editor/presentation/LoadMetaModelResourceAction.java
index 07a0494..1471034 100644
--- a/org.eclipse.gmt.modisco.infra.query.editor/src/org/eclipse/gmt/modisco/infra/query/editor/presentation/LoadMetaModelResourceAction.java
+++ b/org.eclipse.gmt.modisco.infra.query.editor/src/org/eclipse/gmt/modisco/infra/query/editor/presentation/LoadMetaModelResourceAction.java
@@ -34,8 +34,9 @@
 

 /**

  * @author gdupe

- * 

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public class LoadMetaModelResourceAction extends LoadResourceAction {

 

 	public LoadMetaModelResourceAction() {

diff --git a/org.eclipse.gmt.modisco.infra.query.editor/src/org/eclipse/gmt/modisco/infra/query/editor/presentation/QueryActionBarContributor.java b/org.eclipse.gmt.modisco.infra.query.editor/src/org/eclipse/gmt/modisco/infra/query/editor/presentation/QueryActionBarContributor.java
index 9ebe8f9..79f2560 100644
--- a/org.eclipse.gmt.modisco.infra.query.editor/src/org/eclipse/gmt/modisco/infra/query/editor/presentation/QueryActionBarContributor.java
+++ b/org.eclipse.gmt.modisco.infra.query.editor/src/org/eclipse/gmt/modisco/infra/query/editor/presentation/QueryActionBarContributor.java
@@ -53,7 +53,9 @@
  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

  * @generated NOT

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public class QueryActionBarContributor

 	extends EditingDomainActionBarContributor

 	implements ISelectionChangedListener {

diff --git a/org.eclipse.gmt.modisco.infra.query.editor/src/org/eclipse/gmt/modisco/infra/query/editor/presentation/QueryEditor.java b/org.eclipse.gmt.modisco.infra.query.editor/src/org/eclipse/gmt/modisco/infra/query/editor/presentation/QueryEditor.java
index f587c1a..84c5286 100644
--- a/org.eclipse.gmt.modisco.infra.query.editor/src/org/eclipse/gmt/modisco/infra/query/editor/presentation/QueryEditor.java
+++ b/org.eclipse.gmt.modisco.infra.query.editor/src/org/eclipse/gmt/modisco/infra/query/editor/presentation/QueryEditor.java
@@ -166,7 +166,9 @@
  * end-user-doc -->

  * 

  * @generated NOT

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public class QueryEditor extends MultiPageEditorPart implements IEditingDomainProvider,

 		ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker, IShowInSource,

 		IShowInTargetList {

diff --git a/org.eclipse.gmt.modisco.infra.query.editor/src/org/eclipse/gmt/modisco/infra/query/editor/presentation/QueryEditorPlugin.java b/org.eclipse.gmt.modisco.infra.query.editor/src/org/eclipse/gmt/modisco/infra/query/editor/presentation/QueryEditorPlugin.java
index 976cae2..0bece54 100644
--- a/org.eclipse.gmt.modisco.infra.query.editor/src/org/eclipse/gmt/modisco/infra/query/editor/presentation/QueryEditorPlugin.java
+++ b/org.eclipse.gmt.modisco.infra.query.editor/src/org/eclipse/gmt/modisco/infra/query/editor/presentation/QueryEditorPlugin.java
@@ -24,7 +24,9 @@
  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

  * @generated

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public final class QueryEditorPlugin extends EMFPlugin {

 	/**

 	 * Keep track of the singleton.

diff --git a/org.eclipse.gmt.modisco.infra.query.editor/src/org/eclipse/gmt/modisco/infra/query/editor/presentation/QueryModelWizard.java b/org.eclipse.gmt.modisco.infra.query.editor/src/org/eclipse/gmt/modisco/infra/query/editor/presentation/QueryModelWizard.java
index 043f256..bf8a677 100644
--- a/org.eclipse.gmt.modisco.infra.query.editor/src/org/eclipse/gmt/modisco/infra/query/editor/presentation/QueryModelWizard.java
+++ b/org.eclipse.gmt.modisco.infra.query.editor/src/org/eclipse/gmt/modisco/infra/query/editor/presentation/QueryModelWizard.java
@@ -65,7 +65,9 @@
  * --> <!-- end-user-doc -->

  * 

  * @generated

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public class QueryModelWizard extends Wizard implements INewWizard {

 	/**

 	 * The supported extensions for created files. <!-- begin-user-doc --> <!--

diff --git a/org.eclipse.gmt.modisco.infra.query.jxpath/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.query.jxpath/META-INF/MANIFEST.MF
index 2fa8c92..5705c38 100644
--- a/org.eclipse.gmt.modisco.infra.query.jxpath/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.query.jxpath/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %pluginName

 Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.query.jxpath;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-ClassPath: .

 Bundle-Vendor: %providerName

 Bundle-Localization: plugin

diff --git a/org.eclipse.gmt.modisco.infra.query.jxpath/plugin.properties b/org.eclipse.gmt.modisco.infra.query.jxpath/plugin.properties
index 7c2c66c..f849d5b 100644
--- a/org.eclipse.gmt.modisco.infra.query.jxpath/plugin.properties
+++ b/org.eclipse.gmt.modisco.infra.query.jxpath/plugin.properties
@@ -8,5 +8,5 @@
 # Contributors:

 #    Gregoire DUPE (Mia-Software) - initial API and implementation

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

-pluginName = MoDisco JXPath Query Model (Incubation)

+pluginName = MoDisco JXPath Query Model (Deprecated, has to be replaced by EMF Facet) (Incubation)

 providerName = Eclipse Modeling Project

diff --git a/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/JXPathModelQuery.java b/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/JXPathModelQuery.java
index e6c7087..207dcf9 100644
--- a/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/JXPathModelQuery.java
+++ b/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/JXPathModelQuery.java
@@ -36,7 +36,9 @@
  * @see org.eclipse.gmt.modisco.infra.query.jxpath.JxpathPackage#getJXPathModelQuery()

  * @model

  * @generated

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public interface JXPathModelQuery extends ModelQuery {

 	/**

 	 * Returns the value of the '<em><b>Query</b></em>' attribute.

diff --git a/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/JxpathFactory.java b/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/JxpathFactory.java
index a48d2a3..a10329c 100644
--- a/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/JxpathFactory.java
+++ b/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/JxpathFactory.java
@@ -22,7 +22,9 @@
  * <!-- end-user-doc -->

  * @see org.eclipse.gmt.modisco.infra.query.jxpath.JxpathPackage

  * @generated

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public interface JxpathFactory extends EFactory {

 	/**

 	 * The singleton instance of the factory.

diff --git a/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/JxpathPackage.java b/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/JxpathPackage.java
index 882a79b..0a74f83 100644
--- a/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/JxpathPackage.java
+++ b/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/JxpathPackage.java
@@ -32,7 +32,9 @@
  * @see org.eclipse.gmt.modisco.infra.query.jxpath.JxpathFactory

  * @model kind="package"

  * @generated

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public interface JxpathPackage extends EPackage {

 	/**

 	 * The package name.

diff --git a/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/impl/JXPathModelQueryImpl.java b/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/impl/JXPathModelQueryImpl.java
index d4c4fbb..c7a8865 100644
--- a/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/impl/JXPathModelQueryImpl.java
+++ b/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/impl/JXPathModelQueryImpl.java
@@ -14,9 +14,7 @@
 package org.eclipse.gmt.modisco.infra.query.jxpath.impl;

 

 import org.eclipse.emf.common.notify.Notification;

-

 import org.eclipse.emf.ecore.EClass;

-

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 

 

@@ -36,7 +34,9 @@
  * </p>

  *

  * @generated

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public class JXPathModelQueryImpl extends ModelQueryImpl implements JXPathModelQuery {

 	/**

 	 * The default value of the '{@link #getQuery() <em>Query</em>}' attribute.

diff --git a/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/impl/JxpathFactoryImpl.java b/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/impl/JxpathFactoryImpl.java
index d4d60d4..12cdaf9 100644
--- a/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/impl/JxpathFactoryImpl.java
+++ b/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/impl/JxpathFactoryImpl.java
@@ -25,7 +25,9 @@
  * An implementation of the model <b>Factory</b>.

  * <!-- end-user-doc -->

  * @generated

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public class JxpathFactoryImpl extends EFactoryImpl implements JxpathFactory {

 	/**

 	 * Creates the default factory implementation.

diff --git a/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/impl/JxpathPackageImpl.java b/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/impl/JxpathPackageImpl.java
index 42e104f..d0cfd6f 100644
--- a/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/impl/JxpathPackageImpl.java
+++ b/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/impl/JxpathPackageImpl.java
@@ -16,11 +16,8 @@
 import org.eclipse.emf.ecore.EAttribute;

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EPackage;

-

 import org.eclipse.emf.ecore.impl.EPackageImpl;

-

 import org.eclipse.gmt.modisco.infra.query.QueryPackage;

-

 import org.eclipse.gmt.modisco.infra.query.jxpath.JXPathModelQuery;

 import org.eclipse.gmt.modisco.infra.query.jxpath.JxpathFactory;

 import org.eclipse.gmt.modisco.infra.query.jxpath.JxpathPackage;

@@ -30,7 +27,9 @@
  * An implementation of the model <b>Package</b>.

  * <!-- end-user-doc -->

  * @generated

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public class JxpathPackageImpl extends EPackageImpl implements JxpathPackage {

 	/**

 	 * <!-- begin-user-doc -->

diff --git a/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/query/Activator.java b/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/query/Activator.java
index 0b8d7da..33c67fa 100644
--- a/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/query/Activator.java
+++ b/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/query/Activator.java
@@ -15,7 +15,9 @@
 

 /**

  * The activator class controls the plug-in life cycle

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public class Activator extends Plugin {

 

 	// The plug-in ID

diff --git a/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/query/JXPathModelQueryAdapter.java b/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/query/JXPathModelQueryAdapter.java
index 403868e..0995fcf 100644
--- a/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/query/JXPathModelQueryAdapter.java
+++ b/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/query/JXPathModelQueryAdapter.java
@@ -19,6 +19,10 @@
 import org.eclipse.gmt.modisco.infra.query.jxpath.JXPathModelQuery;

 import org.eclipse.gmt.modisco.infra.query.runtime.ModelQueryParameterValue;

 

+/**

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

+ */

+@Deprecated

 public class JXPathModelQueryAdapter extends AbstractModelQuery {

 

 	public JXPathModelQueryAdapter(final JXPathModelQuery modelQuery) {

diff --git a/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/query/JXPathModelQueryFactory.java b/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/query/JXPathModelQueryFactory.java
index 9a845ed..c96d1a6 100644
--- a/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/query/JXPathModelQueryFactory.java
+++ b/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/query/JXPathModelQueryFactory.java
@@ -21,6 +21,10 @@
 import org.eclipse.gmt.modisco.infra.query.jxpath.JxpathPackage;

 import org.osgi.framework.Bundle;

 

+/**

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

+ */

+@Deprecated

 public class JXPathModelQueryFactory implements IModelQueryFactory {

 

 	public AbstractModelQuery create(final ModelQuery modelQuery,

diff --git a/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/util/JxpathAdapterFactory.java b/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/util/JxpathAdapterFactory.java
index a1349fa..bcd5286 100644
--- a/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/util/JxpathAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/util/JxpathAdapterFactory.java
@@ -19,8 +19,6 @@
 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gmt.modisco.infra.query.ModelQuery;

 import org.eclipse.gmt.modisco.infra.query.jxpath.*;

-import org.eclipse.gmt.modisco.infra.query.jxpath.JXPathModelQuery;

-import org.eclipse.gmt.modisco.infra.query.jxpath.JxpathPackage;

 

 /**

  * <!-- begin-user-doc -->

@@ -29,7 +27,9 @@
  * <!-- end-user-doc -->

  * @see org.eclipse.gmt.modisco.infra.query.jxpath.JxpathPackage

  * @generated

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public class JxpathAdapterFactory extends AdapterFactoryImpl {

 	/**

 	 * The cached model package.

diff --git a/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/util/JxpathSwitch.java b/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/util/JxpathSwitch.java
index 687f970..eac0480 100644
--- a/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/util/JxpathSwitch.java
+++ b/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/util/JxpathSwitch.java
@@ -19,8 +19,6 @@
 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gmt.modisco.infra.query.ModelQuery;

 import org.eclipse.gmt.modisco.infra.query.jxpath.*;

-import org.eclipse.gmt.modisco.infra.query.jxpath.JXPathModelQuery;

-import org.eclipse.gmt.modisco.infra.query.jxpath.JxpathPackage;

 

 /**

  * <!-- begin-user-doc -->

@@ -34,7 +32,9 @@
  * <!-- end-user-doc -->

  * @see org.eclipse.gmt.modisco.infra.query.jxpath.JxpathPackage

  * @generated

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public class JxpathSwitch<T> {

 	/**

 	 * The cached model package

diff --git a/org.eclipse.gmt.modisco.infra.query.ui/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.query.ui/META-INF/MANIFEST.MF
index 2fb783a..f02f9e8 100644
--- a/org.eclipse.gmt.modisco.infra.query.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.query.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.query.ui;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.gmt.modisco.infra.query.ui.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.gmt.modisco.infra.query.ui/OSGI-INF/l10n/bundle.properties b/org.eclipse.gmt.modisco.infra.query.ui/OSGI-INF/l10n/bundle.properties
index 36f79ca..83e6a31 100644
--- a/org.eclipse.gmt.modisco.infra.query.ui/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.gmt.modisco.infra.query.ui/OSGI-INF/l10n/bundle.properties
@@ -13,7 +13,7 @@
 category.name = MoDisco

 catalogView.name = Query Sets

 Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = MoDisco Query User Interface (Incubation)

+Bundle-Name = MoDisco Query User Interface (Deprecated, has to be replaced by EMF Facet) (Incubation)

 queryExecutionView.name = Query Execution

 

 extension-point.name = Display the results of a query execution

diff --git a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/Activator.java b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/Activator.java
index ad1e71a..89aedf3 100644
--- a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/Activator.java
+++ b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/Activator.java
@@ -15,7 +15,9 @@
 

 /**

  * The activator class controls the plug-in life cycle

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public class Activator extends AbstractUIPlugin {

 

 	// The plug-in ID

diff --git a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/ImageProvider.java b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/ImageProvider.java
index 836af1e..f7d655a 100644
--- a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/ImageProvider.java
+++ b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/ImageProvider.java
@@ -18,8 +18,9 @@
 

 /**

  * @author Gregoire DUPE (Mia-Software)

- * 

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public final class ImageProvider {

 	//	private static final String MODEL_QUERY_SET = "icons/modelQuerySet.png"; //$NON-NLS-1$

 	//	private static final String MODEL_QUERY = "icons/modelQuery.png"; //$NON-NLS-1$

diff --git a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/Messages.java b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/Messages.java
index 117e398..f7998a0 100644
--- a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/Messages.java
+++ b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/Messages.java
@@ -15,8 +15,9 @@
 

 /**

  * @author gdupe

- * 

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public final class Messages extends NLS {

 	private static final String BUNDLE_NAME = "org.eclipse.gmt.modisco.infra.query.ui.messages"; //$NON-NLS-1$

 	public static String ContextPaneMenuManager_Remove;

diff --git a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/actions/CreateQuerySetAction.java b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/actions/CreateQuerySetAction.java
index d2cac95..ab181ad 100644
--- a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/actions/CreateQuerySetAction.java
+++ b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/actions/CreateQuerySetAction.java
@@ -18,6 +18,10 @@
 import org.eclipse.ui.IWorkbench;

 import org.eclipse.ui.PlatformUI;

 

+/**

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

+ */

+@Deprecated

 public class CreateQuerySetAction extends Action {

 

 	public CreateQuerySetAction() {

diff --git a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/controls/QueryFilteredTree.java b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/controls/QueryFilteredTree.java
index 7542aa7..bad7437 100644
--- a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/controls/QueryFilteredTree.java
+++ b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/controls/QueryFilteredTree.java
@@ -36,7 +36,9 @@
 /**

  * A control that displays a tree of queries in their query sets, with a filter

  * text field.

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public class QueryFilteredTree extends FilteredTree {

 

 	/**

diff --git a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/dialogs/QuerySelectionDialog.java b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/dialogs/QuerySelectionDialog.java
index 63e561a..14ed816 100644
--- a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/dialogs/QuerySelectionDialog.java
+++ b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/dialogs/QuerySelectionDialog.java
@@ -54,7 +54,11 @@
 import org.eclipse.swt.widgets.Menu;

 import org.eclipse.swt.widgets.Shell;

 

-/** A dialog to select a {@link ModelQuery} */

+/**

+ * A dialog to select a {@link ModelQuery}

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

+ */

+@Deprecated

 public class QuerySelectionDialog extends Dialog {

 

 	private static final int INITIAL_WIDTH = 400;

diff --git a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/exceptions/ClassAlreadyExistsException.java b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/exceptions/ClassAlreadyExistsException.java
index a8dd206..71c186b 100644
--- a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/exceptions/ClassAlreadyExistsException.java
+++ b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/exceptions/ClassAlreadyExistsException.java
@@ -10,6 +10,10 @@
  *******************************************************************************/

 package org.eclipse.gmt.modisco.infra.query.ui.exceptions;

 

+/**

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

+ */

+@Deprecated

 public class ClassAlreadyExistsException extends Exception {

 

 	private static final long serialVersionUID = -7352916272441579074L;

diff --git a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/exceptions/ResourceURIExpectedException.java b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/exceptions/ResourceURIExpectedException.java
index 64b659c..2a431f2 100644
--- a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/exceptions/ResourceURIExpectedException.java
+++ b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/exceptions/ResourceURIExpectedException.java
@@ -10,6 +10,10 @@
  *******************************************************************************/

 package org.eclipse.gmt.modisco.infra.query.ui.exceptions;

 

+/**

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

+ */

+@Deprecated

 public class ResourceURIExpectedException extends Exception {

 

 	private static final long serialVersionUID = 6891585699949077305L;

diff --git a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/extensions/IQueryAttributesWizardPage.java b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/extensions/IQueryAttributesWizardPage.java
index 96a9399..8025700 100644
--- a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/extensions/IQueryAttributesWizardPage.java
+++ b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/extensions/IQueryAttributesWizardPage.java
@@ -14,6 +14,10 @@
 import org.eclipse.gmt.modisco.infra.query.ModelQuerySet;

 import org.eclipse.jface.wizard.IWizardPage;

 

+/**

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

+ */

+@Deprecated

 public interface IQueryAttributesWizardPage extends IWizardPage {

 

 	/**

diff --git a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/extensions/IQueryFactory.java b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/extensions/IQueryFactory.java
index f9175a6..fe2e6db 100644
--- a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/extensions/IQueryFactory.java
+++ b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/extensions/IQueryFactory.java
@@ -12,6 +12,10 @@
 

 import org.eclipse.gmt.modisco.infra.query.ModelQuery;

 

+/**

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

+ */

+@Deprecated

 public interface IQueryFactory {

 	/**

 	 * Create an instance of a model query of the type corresponding to the

diff --git a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/filters/QueryReturnTypeFilter.java b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/filters/QueryReturnTypeFilter.java
index a71a619..b9980cf 100644
--- a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/filters/QueryReturnTypeFilter.java
+++ b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/filters/QueryReturnTypeFilter.java
@@ -17,6 +17,10 @@
 import org.eclipse.jface.viewers.Viewer;

 import org.eclipse.jface.viewers.ViewerFilter;

 

+/**

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

+ */

+@Deprecated

 public class QueryReturnTypeFilter extends ViewerFilter {

 

 	private final List<Class<?>> expectedReturnTypes;

diff --git a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/filters/QueryScopeFilter.java b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/filters/QueryScopeFilter.java
index fcd35d8..f7a2900 100644
--- a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/filters/QueryScopeFilter.java
+++ b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/filters/QueryScopeFilter.java
@@ -17,6 +17,10 @@
 import org.eclipse.jface.viewers.Viewer;

 import org.eclipse.jface.viewers.ViewerFilter;

 

+/**

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

+ */

+@Deprecated

 public class QueryScopeFilter extends ViewerFilter {

 

 	private final EClass expectedScope;

diff --git a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/handlers/CreateJavaQueryClassHandler.java b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/handlers/CreateJavaQueryClassHandler.java
index 020b947..ac09658 100644
--- a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/handlers/CreateJavaQueryClassHandler.java
+++ b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/handlers/CreateJavaQueryClassHandler.java
@@ -39,6 +39,10 @@
 import org.eclipse.ui.IWorkbenchWindow;

 import org.eclipse.ui.handlers.HandlerUtil;

 

+/**

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

+ */

+@Deprecated

 public class CreateJavaQueryClassHandler extends AbstractHandler {

 

 	public CreateJavaQueryClassHandler() {

diff --git a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/handlers/CreateQueryHandler.java b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/handlers/CreateQueryHandler.java
index 2174d66..37740d1 100644
--- a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/handlers/CreateQueryHandler.java
+++ b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/handlers/CreateQueryHandler.java
@@ -28,6 +28,10 @@
 import org.eclipse.ui.IWorkbenchPart;

 import org.eclipse.ui.handlers.HandlerUtil;

 

+/**

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

+ */

+@Deprecated

 public class CreateQueryHandler extends AbstractHandler {

 

 	public CreateQueryHandler() {

diff --git a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/handlers/ExecuteQueryHandler.java b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/handlers/ExecuteQueryHandler.java
index a6ac617..5152c85 100644
--- a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/handlers/ExecuteQueryHandler.java
+++ b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/handlers/ExecuteQueryHandler.java
@@ -35,7 +35,9 @@
 /**

  * Opens the "Query Execution" view, and sets its context to the list of

  * currently selected {@link EObject}s.

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public class ExecuteQueryHandler extends AbstractHandler {

 

 	public ExecuteQueryHandler() {

diff --git a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/views/ModelQueryView.java b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/views/ModelQueryView.java
index cb910c9..b0dd94e 100644
--- a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/views/ModelQueryView.java
+++ b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/views/ModelQueryView.java
@@ -41,7 +41,9 @@
 /**

  * An Eclipse view that displays a list of available MoDisco query sets.

  * Clicking on a query set opens it in the query set editor.

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public class ModelQueryView extends AbstractTreeView implements ModiscoCatalogChangeListener {

 

 	private static final String NAME_COLUMN = "ModelQueryView_NameColumn"; //$NON-NLS-1$

diff --git a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/views/queryExecution/QueryResultDisplayer.java b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/views/queryExecution/QueryResultDisplayer.java
index ef3d15e..94ee799 100644
--- a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/views/queryExecution/QueryResultDisplayer.java
+++ b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/views/queryExecution/QueryResultDisplayer.java
@@ -17,7 +17,9 @@
 /**

  * Implemented by a view or editor that wants to be used to display the results

  * of a model query.

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public interface QueryResultDisplayer {

 	void displayQueryResult(final List<ModelQueryResult> result);

 }

diff --git a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/views/queryExecution/internal/ContextPaneMenuManager.java b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/views/queryExecution/internal/ContextPaneMenuManager.java
index 5497ba6..721d771 100644
--- a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/views/queryExecution/internal/ContextPaneMenuManager.java
+++ b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/views/queryExecution/internal/ContextPaneMenuManager.java
@@ -24,6 +24,10 @@
 import org.eclipse.swt.events.KeyAdapter;

 import org.eclipse.swt.events.KeyEvent;

 

+/**

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

+ */

+@Deprecated

 @SuppressWarnings("synthetic-access")

 public class ContextPaneMenuManager extends MenuManager implements IMenuListener {

 

diff --git a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/views/queryExecution/internal/DropAdapter.java b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/views/queryExecution/internal/DropAdapter.java
index d75f17e..742ce86 100644
--- a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/views/queryExecution/internal/DropAdapter.java
+++ b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/views/queryExecution/internal/DropAdapter.java
@@ -26,7 +26,9 @@
  * Implements a {@link DropTargetListener} that accepts {@link EObject}s

  * transferred locally (i.e. through {@link LocalTransfer}), and calls the given

  * {@link DropAction} with the dropped {@link EObject}s.

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public class DropAdapter implements DropTargetListener {

 

 	private final DropAction dropAction;

diff --git a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/views/queryExecution/internal/EditableContext.java b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/views/queryExecution/internal/EditableContext.java
index 72d655a..0f552e8 100644
--- a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/views/queryExecution/internal/EditableContext.java
+++ b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/views/queryExecution/internal/EditableContext.java
@@ -12,7 +12,11 @@
 

 import org.eclipse.emf.ecore.EObject;

 

-/** An interface that supports editing the query context */

+/**

+ * An interface that supports editing the query context

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

+ */

+@Deprecated

 public interface EditableContext {

 	void add(EObject eObject);

 

diff --git a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/views/queryExecution/internal/QueryExecutionView.java b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/views/queryExecution/internal/QueryExecutionView.java
index 07d93cd..357152d 100644
--- a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/views/queryExecution/internal/QueryExecutionView.java
+++ b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/views/queryExecution/internal/QueryExecutionView.java
@@ -94,6 +94,10 @@
 import org.eclipse.ui.IWorkbenchActionConstants;

 import org.eclipse.ui.part.ViewPart;

 

+/**

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

+ */

+@Deprecated

 @SuppressWarnings("synthetic-access")

 public class QueryExecutionView extends ViewPart {

 

diff --git a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/views/queryExecution/internal/QueryResultDisplayersRegistry.java b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/views/queryExecution/internal/QueryResultDisplayersRegistry.java
index 0ff6f28..2ce2182 100644
--- a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/views/queryExecution/internal/QueryResultDisplayersRegistry.java
+++ b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/views/queryExecution/internal/QueryResultDisplayersRegistry.java
@@ -26,7 +26,9 @@
 /**

  * The singleton registry of {@link QueryResultDisplayer}s, which initializes

  * the registry by reading extensions when first accessed.

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public class QueryResultDisplayersRegistry extends AbstractRegistry {

 

 	private static final String EXTENSION_POINT_NAMESPACE = "org.eclipse.gmt.modisco.infra.query.ui"; //$NON-NLS-1$

diff --git a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/views/queryExecution/internal/QueryTooltip.java b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/views/queryExecution/internal/QueryTooltip.java
index d76b3ae..6256729 100644
--- a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/views/queryExecution/internal/QueryTooltip.java
+++ b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/views/queryExecution/internal/QueryTooltip.java
@@ -35,7 +35,9 @@
  * Add a tooltip to the tree, that appears when the mouse hovers over a

  * {@link ModelQuery}, to display information about that query (name, return

  * type, description, ...)

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public class QueryTooltip extends Tooltip {

 

 	public QueryTooltip() {

diff --git a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/wizards/CreateQueryWizard.java b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/wizards/CreateQueryWizard.java
index b6928d5..e3319ac 100644
--- a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/wizards/CreateQueryWizard.java
+++ b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/wizards/CreateQueryWizard.java
@@ -36,6 +36,10 @@
 import org.eclipse.jface.wizard.IWizardPage;

 import org.eclipse.jface.wizard.Wizard;

 

+/**

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

+ */

+@Deprecated

 public class CreateQueryWizard extends Wizard {

 

 	/**

diff --git a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/wizards/CreateQueryWizardPage.java b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/wizards/CreateQueryWizardPage.java
index 5681ca3..1e6cf64 100644
--- a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/wizards/CreateQueryWizardPage.java
+++ b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/wizards/CreateQueryWizardPage.java
@@ -44,6 +44,10 @@
 import org.eclipse.swt.widgets.Text;

 import org.eclipse.ui.dialogs.FilteredList;

 

+/**

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

+ */

+@Deprecated

 @SuppressWarnings("synthetic-access")

 public class CreateQueryWizardPage extends WizardPage {

 

diff --git a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/wizards/NewClassCreationWizard.java b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/wizards/NewClassCreationWizard.java
index adf9135..cc09276 100644
--- a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/wizards/NewClassCreationWizard.java
+++ b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/wizards/NewClassCreationWizard.java
@@ -27,6 +27,10 @@
 import org.eclipse.jdt.core.JavaModelException;

 import org.eclipse.jface.wizard.Wizard;

 

+/**

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

+ */

+@Deprecated

 public class NewClassCreationWizard extends Wizard {

 

 	private final JavaModelQuery query;

diff --git a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/wizards/NewClassWizardPage.java b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/wizards/NewClassWizardPage.java
index 60b2bba..eec3a29 100644
--- a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/wizards/NewClassWizardPage.java
+++ b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/wizards/NewClassWizardPage.java
@@ -17,10 +17,13 @@
 import org.eclipse.core.runtime.IStatus;

 import org.eclipse.jface.dialogs.Dialog;

 import org.eclipse.jface.viewers.IStructuredSelection;

-

 import org.eclipse.jdt.core.IJavaElement;

 import org.eclipse.jdt.ui.wizards.NewTypeWizardPage;

 

+/**

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

+ */

+@Deprecated

 public class NewClassWizardPage extends NewTypeWizardPage {

 

 	private static final String PAGE_NAME = "NewClassWizardPage"; //$NON-NLS-1$

diff --git a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/wizards/NewQueryClassWizardPage.java b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/wizards/NewQueryClassWizardPage.java
index 95323e7..6d84333 100644
--- a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/wizards/NewQueryClassWizardPage.java
+++ b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/wizards/NewQueryClassWizardPage.java
@@ -68,6 +68,10 @@
 import org.eclipse.ui.PlatformUI;

 import org.eclipse.ui.ide.IDE;

 

+/**

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

+ */

+@Deprecated

 public class NewQueryClassWizardPage extends NewClassWizardPage implements

 		IQueryAttributesWizardPage {

 

diff --git a/org.eclipse.gmt.modisco.infra.query/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.query/META-INF/MANIFEST.MF
index 9616fc7..30d7a74 100644
--- a/org.eclipse.gmt.modisco.infra.query/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.query/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %pluginName

 Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.query;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-ClassPath: .

 Bundle-Vendor: %providerName

 Bundle-Localization: plugin

diff --git a/org.eclipse.gmt.modisco.infra.query/plugin.properties b/org.eclipse.gmt.modisco.infra.query/plugin.properties
index 7a420b8..7dae547 100644
--- a/org.eclipse.gmt.modisco.infra.query/plugin.properties
+++ b/org.eclipse.gmt.modisco.infra.query/plugin.properties
@@ -8,6 +8,6 @@
 # Contributors:

 #    Gregoire DUPE (Mia-Software) - initial API and implementation

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

-pluginName = MoDisco Query Model (Incubation)

+pluginName = MoDisco Query Model (Deprecated, has to be replaced by EMF Facet) (Incubation)

 providerName = Eclipse Modeling Project

 content-type.name = QuerySet

diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/JavaModelQuery.java b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/JavaModelQuery.java
index 0fba69b..bf697d0 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/JavaModelQuery.java
+++ b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/JavaModelQuery.java
@@ -34,7 +34,9 @@
  * @see org.eclipse.gmt.modisco.infra.query.QueryPackage#getJavaModelQuery()

  * @model

  * @generated

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public interface JavaModelQuery extends ModelQuery {

 	/**

 	 * Returns the value of the '<em><b>Implementation Class Name</b></em>'

diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/Messages.java b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/Messages.java
index 9f4ea1d..ae29d22 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/Messages.java
+++ b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/Messages.java
@@ -14,8 +14,9 @@
 

 /**

  * @author gdupe

- *

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public final class Messages extends NLS {

 	private static final String BUNDLE_NAME = "org.eclipse.gmt.modisco.infra.query.messages"; //$NON-NLS-1$

 	public static String ReturnTypeValidation_0;

diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/ModelQuery.java b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/ModelQuery.java
index 90d5fe8..993c364 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/ModelQuery.java
+++ b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/ModelQuery.java
@@ -46,7 +46,9 @@
  * @see org.eclipse.gmt.modisco.infra.query.QueryPackage#getModelQuery()

  * @model abstract="true"

  * @generated

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public interface ModelQuery extends EObject {

 	/**

 	 * Returns the value of the '<em><b>Name</b></em>' attribute.

diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/ModelQueryParameter.java b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/ModelQueryParameter.java
index 37d16b6..6fce273 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/ModelQueryParameter.java
+++ b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/ModelQueryParameter.java
@@ -39,7 +39,9 @@
  * @see org.eclipse.gmt.modisco.infra.query.QueryPackage#getModelQueryParameter()

  * @model

  * @generated

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public interface ModelQueryParameter extends EObject {

 	/**

 	 * Returns the value of the '<em><b>Name</b></em>' attribute.

diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/ModelQuerySet.java b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/ModelQuerySet.java
index e8b9a14..0df521c 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/ModelQuerySet.java
+++ b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/ModelQuerySet.java
@@ -41,7 +41,9 @@
  * @see org.eclipse.gmt.modisco.infra.query.QueryPackage#getModelQuerySet()

  * @model

  * @generated

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public interface ModelQuerySet extends EObject {

 	/**

 	 * Returns the value of the '<em><b>Associated Metamodels</b></em>' reference list.

diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/OCLModelQuery.java b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/OCLModelQuery.java
index 67aeca5..b69d76a 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/OCLModelQuery.java
+++ b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/OCLModelQuery.java
@@ -30,7 +30,9 @@
  * @see org.eclipse.gmt.modisco.infra.query.QueryPackage#getOCLModelQuery()

  * @model

  * @generated

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public interface OCLModelQuery extends ModelQuery {

 	/**

 	 * Returns the value of the '<em><b>Query</b></em>' attribute.

diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/QueryFactory.java b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/QueryFactory.java
index 5489474..45454e5 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/QueryFactory.java
+++ b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/QueryFactory.java
@@ -23,7 +23,9 @@
  * <!-- end-user-doc -->

  * @see org.eclipse.gmt.modisco.infra.query.QueryPackage

  * @generated

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public interface QueryFactory extends EFactory {

 	/**

 	 * The singleton instance of the factory.

diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/QueryPackage.java b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/QueryPackage.java
index 1d99f33..30156d8 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/QueryPackage.java
+++ b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/QueryPackage.java
@@ -33,7 +33,9 @@
  * @see org.eclipse.gmt.modisco.infra.query.QueryFactory

  * @model kind="package"

  * @generated

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public interface QueryPackage extends EPackage {

 	/**

 	 * The package name.

diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/impl/JavaModelQueryImpl.java b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/impl/JavaModelQueryImpl.java
index 27749ca..57a5d56 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/impl/JavaModelQueryImpl.java
+++ b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/impl/JavaModelQueryImpl.java
@@ -15,11 +15,8 @@
 package org.eclipse.gmt.modisco.infra.query.impl;

 

 import org.eclipse.emf.common.notify.Notification;

-

 import org.eclipse.emf.ecore.EClass;

-

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

-

 import org.eclipse.gmt.modisco.infra.query.JavaModelQuery;

 import org.eclipse.gmt.modisco.infra.query.QueryPackage;

 

@@ -35,7 +32,9 @@
  * </p>

  *

  * @generated

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public class JavaModelQueryImpl extends ModelQueryImpl implements JavaModelQuery {

 	/**

 	 * The default value of the '{@link #getImplementationClassName() <em>Implementation Class Name</em>}' attribute.

diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/impl/ModelQueryImpl.java b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/impl/ModelQueryImpl.java
index c365850..04fff71 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/impl/ModelQueryImpl.java
+++ b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/impl/ModelQueryImpl.java
@@ -53,7 +53,9 @@
  * </p>

  *

  * @generated

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public abstract class ModelQueryImpl extends EObjectImpl implements ModelQuery {

 	/**

 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.

diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/impl/ModelQueryParameterImpl.java b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/impl/ModelQueryParameterImpl.java
index dce85f5..1778779 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/impl/ModelQueryParameterImpl.java
+++ b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/impl/ModelQueryParameterImpl.java
@@ -15,14 +15,11 @@
 package org.eclipse.gmt.modisco.infra.query.impl;

 

 import org.eclipse.emf.common.notify.Notification;

-

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EClassifier;

 import org.eclipse.emf.ecore.InternalEObject;

-

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 import org.eclipse.emf.ecore.impl.EObjectImpl;

-

 import org.eclipse.gmt.modisco.infra.query.ModelQueryParameter;

 import org.eclipse.gmt.modisco.infra.query.QueryPackage;

 

@@ -41,7 +38,9 @@
  * </p>

  *

  * @generated

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public class ModelQueryParameterImpl extends EObjectImpl implements ModelQueryParameter {

 	/**

 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.

diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/impl/ModelQuerySetImpl.java b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/impl/ModelQuerySetImpl.java
index 4feeac7..5fe47ff 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/impl/ModelQuerySetImpl.java
+++ b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/impl/ModelQuerySetImpl.java
@@ -47,7 +47,9 @@
  * </p>

  *

  * @generated

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public class ModelQuerySetImpl extends EObjectImpl implements ModelQuerySet {

 	/**

 	 * The cached value of the '{@link #getAssociatedMetamodels() <em>Associated Metamodels</em>}' reference list.

diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/impl/OCLModelQueryImpl.java b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/impl/OCLModelQueryImpl.java
index 6076596..75d27fe 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/impl/OCLModelQueryImpl.java
+++ b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/impl/OCLModelQueryImpl.java
@@ -15,11 +15,8 @@
 package org.eclipse.gmt.modisco.infra.query.impl;

 

 import org.eclipse.emf.common.notify.Notification;

-

 import org.eclipse.emf.ecore.EClass;

-

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

-

 import org.eclipse.gmt.modisco.infra.query.OCLModelQuery;

 import org.eclipse.gmt.modisco.infra.query.QueryPackage;

 

@@ -35,7 +32,9 @@
  * </p>

  *

  * @generated

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public class OCLModelQueryImpl extends ModelQueryImpl implements OCLModelQuery {

 	/**

 	 * The default value of the '{@link #getQuery() <em>Query</em>}' attribute.

diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/impl/QueryFactoryImpl.java b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/impl/QueryFactoryImpl.java
index e997319..5619536 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/impl/QueryFactoryImpl.java
+++ b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/impl/QueryFactoryImpl.java
@@ -26,7 +26,9 @@
  * An implementation of the model <b>Factory</b>.

  * <!-- end-user-doc -->

  * @generated

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public class QueryFactoryImpl extends EFactoryImpl implements QueryFactory {

 	/**

 	 * Creates the default factory implementation.

diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/impl/QueryPackageImpl.java b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/impl/QueryPackageImpl.java
index 9a9bbda..b0589a2 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/impl/QueryPackageImpl.java
+++ b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/impl/QueryPackageImpl.java
@@ -36,7 +36,9 @@
  * An implementation of the model <b>Package</b>.

  * <!-- end-user-doc -->

  * @generated

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public class QueryPackageImpl extends EPackageImpl implements QueryPackage {

 	/**

 	 * <!-- begin-user-doc -->

diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/plugin/QueryPlugin.java b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/plugin/QueryPlugin.java
index ecb8c2c..b880c06 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/plugin/QueryPlugin.java
+++ b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/plugin/QueryPlugin.java
@@ -15,7 +15,9 @@
 

 /**

  * The activator class controls the plug-in life cycle

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public class QueryPlugin extends Plugin {

 

 	// The plug-in ID

diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/ModelQueryContext.java b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/ModelQueryContext.java
index 9a11a66..7a6b5bb 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/ModelQueryContext.java
+++ b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/ModelQueryContext.java
@@ -15,9 +15,7 @@
 package org.eclipse.gmt.modisco.infra.query.runtime;

 

 import org.eclipse.emf.common.util.EList;

-

 import org.eclipse.emf.ecore.EObject;

-

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

 

 /**

@@ -36,7 +34,9 @@
  * @see org.eclipse.gmt.modisco.infra.query.runtime.RuntimePackage#getModelQueryContext()

  * @model

  * @generated

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public interface ModelQueryContext extends EObject {

 	/**

 	 * Returns the value of the '<em><b>Selected Model Elements</b></em>' reference list.

diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/ModelQueryParameterValue.java b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/ModelQueryParameterValue.java
index 6cc499b..3696076 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/ModelQueryParameterValue.java
+++ b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/ModelQueryParameterValue.java
@@ -15,7 +15,6 @@
 package org.eclipse.gmt.modisco.infra.query.runtime;

 

 import org.eclipse.emf.ecore.EObject;

-

 import org.eclipse.gmt.modisco.infra.query.ModelQueryParameter;

 

 /**

@@ -34,7 +33,9 @@
  * @see org.eclipse.gmt.modisco.infra.query.runtime.RuntimePackage#getModelQueryParameterValue()

  * @model

  * @generated

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public interface ModelQueryParameterValue extends EObject {

 	/**

 	 * Returns the value of the '<em><b>Parameter</b></em>' reference.

diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/ModelQueryResult.java b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/ModelQueryResult.java
index e99f7ba..2173bfc 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/ModelQueryResult.java
+++ b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/ModelQueryResult.java
@@ -33,7 +33,9 @@
  * @see org.eclipse.gmt.modisco.infra.query.runtime.RuntimePackage#getModelQueryResult()

  * @model

  * @generated

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public interface ModelQueryResult extends EObject {

 	/**

 	 * Returns the value of the '<em><b>Source</b></em>' reference.

diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/RuntimeFactory.java b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/RuntimeFactory.java
index 25c8728..a3a81d9 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/RuntimeFactory.java
+++ b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/RuntimeFactory.java
@@ -23,7 +23,9 @@
  * <!-- end-user-doc -->

  * @see org.eclipse.gmt.modisco.infra.query.runtime.RuntimePackage

  * @generated

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public interface RuntimeFactory extends EFactory {

 	/**

 	 * The singleton instance of the factory.

diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/RuntimePackage.java b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/RuntimePackage.java
index dc1d60f..ff97949 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/RuntimePackage.java
+++ b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/RuntimePackage.java
@@ -34,7 +34,9 @@
  * @see org.eclipse.gmt.modisco.infra.query.runtime.RuntimeFactory

  * @model kind="package"

  * @generated

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public interface RuntimePackage extends EPackage {

 	/**

 	 * The package name.

@@ -337,7 +339,9 @@
 	 * </ul>

 	 * <!-- end-user-doc -->

 	 * @generated

+	 * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

 	 */

+	@Deprecated

 	interface Literals {

 		/**

 		 * The meta object literal for the '{@link org.eclipse.gmt.modisco.infra.query.runtime.impl.ModelQueryContextImpl <em>Model Query Context</em>}' class.

diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/impl/ModelQueryContextImpl.java b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/impl/ModelQueryContextImpl.java
index e012e56..0aec13d 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/impl/ModelQueryContextImpl.java
+++ b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/impl/ModelQueryContextImpl.java
@@ -17,17 +17,12 @@
 import java.util.Collection;

 

 import org.eclipse.emf.common.util.EList;

-

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EObject;

-

 import org.eclipse.emf.ecore.impl.EObjectImpl;

-

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

-

 import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;

 import org.eclipse.emf.ecore.util.EObjectResolvingEList;

-

 import org.eclipse.gmt.modisco.infra.query.runtime.ModelQueryContext;

 import org.eclipse.gmt.modisco.infra.query.runtime.RuntimePackage;

 

@@ -44,7 +39,9 @@
  * </p>

  *

  * @generated

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public class ModelQueryContextImpl extends EObjectImpl implements ModelQueryContext {

 	/**

 	 * The cached value of the '{@link #getSelectedModelElements() <em>Selected Model Elements</em>}' reference list.

diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/impl/ModelQueryParameterValueImpl.java b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/impl/ModelQueryParameterValueImpl.java
index f7a1540..9032111 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/impl/ModelQueryParameterValueImpl.java
+++ b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/impl/ModelQueryParameterValueImpl.java
@@ -15,15 +15,11 @@
 package org.eclipse.gmt.modisco.infra.query.runtime.impl;

 

 import org.eclipse.emf.common.notify.Notification;

-

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

-

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 import org.eclipse.emf.ecore.impl.EObjectImpl;

-

 import org.eclipse.gmt.modisco.infra.query.ModelQueryParameter;

-

 import org.eclipse.gmt.modisco.infra.query.runtime.ModelQueryParameterValue;

 import org.eclipse.gmt.modisco.infra.query.runtime.RuntimePackage;

 

@@ -40,7 +36,9 @@
  * </p>

  *

  * @generated

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public class ModelQueryParameterValueImpl extends EObjectImpl implements ModelQueryParameterValue {

 	/**

 	 * The cached value of the '{@link #getParameter() <em>Parameter</em>}' reference.

diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/impl/ModelQueryResultImpl.java b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/impl/ModelQueryResultImpl.java
index c14cb24..49c27e5 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/impl/ModelQueryResultImpl.java
+++ b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/impl/ModelQueryResultImpl.java
@@ -15,14 +15,11 @@
 package org.eclipse.gmt.modisco.infra.query.runtime.impl;

 

 import org.eclipse.emf.common.notify.Notification;

-

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.InternalEObject;

-

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 import org.eclipse.emf.ecore.impl.EObjectImpl;

-

 import org.eclipse.gmt.modisco.infra.query.runtime.ModelQueryResult;

 import org.eclipse.gmt.modisco.infra.query.runtime.RuntimePackage;

 

@@ -40,7 +37,9 @@
  * </p>

  *

  * @generated

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public class ModelQueryResultImpl extends EObjectImpl implements ModelQueryResult {

 	/**

 	 * The cached value of the '{@link #getSource() <em>Source</em>}' reference.

diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/impl/RuntimeFactoryImpl.java b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/impl/RuntimeFactoryImpl.java
index 9b4abe3..f6005db 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/impl/RuntimeFactoryImpl.java
+++ b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/impl/RuntimeFactoryImpl.java
@@ -27,7 +27,9 @@
  * An implementation of the model <b>Factory</b>.

  * <!-- end-user-doc -->

  * @generated

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public class RuntimeFactoryImpl extends EFactoryImpl implements RuntimeFactory {

 	/**

 	 * Creates the default factory implementation.

diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/impl/RuntimePackageImpl.java b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/impl/RuntimePackageImpl.java
index 4f8de90..af4fbf9 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/impl/RuntimePackageImpl.java
+++ b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/impl/RuntimePackageImpl.java
@@ -34,7 +34,9 @@
  * An implementation of the model <b>Package</b>.

  * <!-- end-user-doc -->

  * @generated

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public class RuntimePackageImpl extends EPackageImpl implements RuntimePackage {

 	/**

 	 * <!-- begin-user-doc -->

diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/util/RuntimeAdapterFactory.java b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/util/RuntimeAdapterFactory.java
index 38de9e9..1afed65 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/util/RuntimeAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/util/RuntimeAdapterFactory.java
@@ -16,11 +16,8 @@
 

 import org.eclipse.emf.common.notify.Adapter;

 import org.eclipse.emf.common.notify.Notifier;

-

 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

-

 import org.eclipse.emf.ecore.EObject;

-

 import org.eclipse.gmt.modisco.infra.query.runtime.*;

 

 /**

@@ -30,7 +27,9 @@
  * <!-- end-user-doc -->

  * @see org.eclipse.gmt.modisco.infra.query.runtime.RuntimePackage

  * @generated

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public class RuntimeAdapterFactory extends AdapterFactoryImpl {

 	/**

 	 * The cached model package.

diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/util/RuntimeSwitch.java b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/util/RuntimeSwitch.java
index 64ea8ab..f95606f 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/util/RuntimeSwitch.java
+++ b/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/util/RuntimeSwitch.java
@@ -18,7 +18,6 @@
 

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EObject;

-

 import org.eclipse.gmt.modisco.infra.query.runtime.*;

 

 /**

@@ -33,7 +32,9 @@
  * <!-- end-user-doc -->

  * @see org.eclipse.gmt.modisco.infra.query.runtime.RuntimePackage

  * @generated

+ * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

+@Deprecated

 public class RuntimeSwitch<T> {

 	/**

 	 * The cached model package

diff --git a/org.eclipse.gmt.modisco.java.browser.customization/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.java.browser.customization/META-INF/MANIFEST.MF
index b6e40b6..2151364 100644
--- a/org.eclipse.gmt.modisco.java.browser.customization/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.java.browser.customization/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.gmt.modisco.java.browser.customization;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Vendor: 
  %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.gmt.modisco.java.browser.customization/OSGI-INF/l10n/bundle.properties b/org.eclipse.gmt.modisco.java.browser.customization/OSGI-INF/l10n/bundle.properties
index a3224c2..fd26aca 100644
--- a/org.eclipse.gmt.modisco.java.browser.customization/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.gmt.modisco.java.browser.customization/OSGI-INF/l10n/bundle.properties
@@ -10,6 +10,6 @@
 ###############################################################################

 #Properties file for org.eclipse.gmt.modisco.java.browser.customization

 Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = MoDisco Java Browser Standard Customization (Incubation)

-wizard.name = Java Browser Customization

-category.name = MoDisco Examples
\ No newline at end of file
+Bundle-Name = MoDisco Java Browser Standard Customization (Deprecated) (Incubation)

+wizard.name = Java Browser Customization (Deprecated)

+category.name = MoDisco Examples (Deprecated)
\ No newline at end of file
diff --git a/org.eclipse.gmt.modisco.java.browser.customization/src/org/eclipse/gmt/modisco/java/browser/customization/internal/Activator.java b/org.eclipse.gmt.modisco.java.browser.customization/src/org/eclipse/gmt/modisco/java/browser/customization/internal/Activator.java
index f105d35..018dde6 100644
--- a/org.eclipse.gmt.modisco.java.browser.customization/src/org/eclipse/gmt/modisco/java/browser/customization/internal/Activator.java
+++ b/org.eclipse.gmt.modisco.java.browser.customization/src/org/eclipse/gmt/modisco/java/browser/customization/internal/Activator.java
@@ -13,6 +13,10 @@
 import org.eclipse.ui.plugin.AbstractUIPlugin;

 import org.osgi.framework.BundleContext;

 

+/**

+ * @deprecated cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=474970

+ */

+@Deprecated

 public class Activator extends AbstractUIPlugin {

 

 	private static Activator plugin;

diff --git a/org.eclipse.gmt.modisco.java.browser.customization/src/org/eclipse/gmt/modisco/java/browser/customization/internal/ExampleWizard.java b/org.eclipse.gmt.modisco.java.browser.customization/src/org/eclipse/gmt/modisco/java/browser/customization/internal/ExampleWizard.java
index 62288be..5560dde 100644
--- a/org.eclipse.gmt.modisco.java.browser.customization/src/org/eclipse/gmt/modisco/java/browser/customization/internal/ExampleWizard.java
+++ b/org.eclipse.gmt.modisco.java.browser.customization/src/org/eclipse/gmt/modisco/java/browser/customization/internal/ExampleWizard.java
@@ -19,6 +19,10 @@
 import org.eclipse.gmt.modisco.infra.common.core.logging.MoDiscoLogger;

 import org.eclipse.gmt.modisco.infra.common.ui.internal.wizards.AbstractExampleWizard;

 

+/**

+ * @deprecated cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=474970

+ */

+@Deprecated

 public class ExampleWizard extends AbstractExampleWizard {

 	@Override

 	protected Plugin getActivator() {

diff --git a/org.eclipse.gmt.modisco.java.cdo/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.java.cdo/META-INF/MANIFEST.MF
index e8613d6..efa48a2 100644
--- a/org.eclipse.gmt.modisco.java.cdo/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.java.cdo/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %pluginName

 Bundle-SymbolicName: org.eclipse.gmt.modisco.java.cdo;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-ClassPath: .

 Bundle-Vendor: %providerName

 Bundle-Localization: plugin

diff --git a/org.eclipse.gmt.modisco.java.classiceobject/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.java.classiceobject/META-INF/MANIFEST.MF
index 49eb77d..dff90e2 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.java.classiceobject/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %pluginName

 Bundle-SymbolicName: org.eclipse.gmt.modisco.java.classiceobject;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-ClassPath: .

 Bundle-Vendor: %providerName

 Bundle-Localization: plugin

diff --git a/org.eclipse.gmt.modisco.java.discoverer.benchmark.tests/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.java.discoverer.benchmark.tests/META-INF/MANIFEST.MF
index a9fca0d..d102a40 100644
--- a/org.eclipse.gmt.modisco.java.discoverer.benchmark.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.java.discoverer.benchmark.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.gmt.modisco.java.discoverer.benchmark.tests
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.gmt.modisco.java.discoverer.benchmark.tests.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.gmt.modisco.java.discoverer.benchmark.tests/OSGI-INF/l10n/bundle.properties b/org.eclipse.gmt.modisco.java.discoverer.benchmark.tests/OSGI-INF/l10n/bundle.properties
index 3612039..186f3b4 100644
--- a/org.eclipse.gmt.modisco.java.discoverer.benchmark.tests/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.gmt.modisco.java.discoverer.benchmark.tests/OSGI-INF/l10n/bundle.properties
@@ -10,4 +10,4 @@
 ###############################################################################

 #Properties file for org.eclipse.gmt.modisco.java.discoverer.benchmark.tests

 Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = MoDisco Java Discoverer Benchmark Tests (Incubation)
\ No newline at end of file
+Bundle-Name = MoDisco Java Discoverer Benchmark Tests (Deprecated) (Incubation)
\ No newline at end of file
diff --git a/org.eclipse.gmt.modisco.java.discoverer.benchmark.tests/src/org/eclipse/gmt/modisco/java/discoverer/benchmark/tests/JavaScalabilityTest.java b/org.eclipse.gmt.modisco.java.discoverer.benchmark.tests/src/org/eclipse/gmt/modisco/java/discoverer/benchmark/tests/JavaScalabilityTest.java
index e4e5a8e..0bdac72 100644
--- a/org.eclipse.gmt.modisco.java.discoverer.benchmark.tests/src/org/eclipse/gmt/modisco/java/discoverer/benchmark/tests/JavaScalabilityTest.java
+++ b/org.eclipse.gmt.modisco.java.discoverer.benchmark.tests/src/org/eclipse/gmt/modisco/java/discoverer/benchmark/tests/JavaScalabilityTest.java
@@ -41,6 +41,11 @@
 import org.junit.Test;

 import org.osgi.framework.Bundle;

 

+/**

+ * @deprecated Will be removed,

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728

+ */

+@Deprecated

 public class JavaScalabilityTest {

 

 	private static final int EXPECTED_MEM_INCR_MAXIMUM = 70;

diff --git a/org.eclipse.gmt.modisco.java.discoverer.benchmark/.project b/org.eclipse.gmt.modisco.java.discoverer.benchmark/.project
index 361d351..f9d472e 100644
--- a/org.eclipse.gmt.modisco.java.discoverer.benchmark/.project
+++ b/org.eclipse.gmt.modisco.java.discoverer.benchmark/.project
@@ -26,16 +26,6 @@
 			</arguments>

 		</buildCommand>

 		<buildCommand>

-			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>

-			<triggers>auto,full,incremental,</triggers>

-			<arguments>

-				<dictionary>

-					<key>LaunchConfigHandle</key>

-					<value>&lt;project&gt;/.externalToolBuilders/emtlCopy.launch</value>

-				</dictionary>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

 			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>

 			<arguments>

 			</arguments>

diff --git a/org.eclipse.gmt.modisco.java.discoverer.benchmark/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.java.discoverer.benchmark/META-INF/MANIFEST.MF
index bcec5ce..2d2eb2d 100644
--- a/org.eclipse.gmt.modisco.java.discoverer.benchmark/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.java.discoverer.benchmark/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.gmt.modisco.java.discoverer.benchmark;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.gmt.modisco.java.discoverer.benchmark.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.gmt.modisco.java;bundle-version="0.7.0",
diff --git a/org.eclipse.gmt.modisco.java.discoverer.benchmark/OSGI-INF/l10n/bundle.properties b/org.eclipse.gmt.modisco.java.discoverer.benchmark/OSGI-INF/l10n/bundle.properties
index 74eda50..d999ac7 100644
--- a/org.eclipse.gmt.modisco.java.discoverer.benchmark/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.gmt.modisco.java.discoverer.benchmark/OSGI-INF/l10n/bundle.properties
@@ -10,18 +10,18 @@
 ###############################################################################

 

 #Properties file for org.eclipse.gmt.modisco.java.discoverer.benchmark

-discoverer.name = Discover Java model from Java project - Benchmark

-discoverer.name.0 = Discover Java model from Java project - Incremental XMI + Trace

-discoverer.name.1 = Discover Java model from Java project - Incremental XMI

-discoverer.name.2 = Discover Java model from Java project - CDO (Not include server launch)

-discoverer.name.3 = Discover Java model from Java project - CDO + NoUsages (Not include server launch)

-discoverer.name.4 = Discover Java model from Java project - No Usages

-discoverer.name.5 = Discover Java model from Java project - Minimal EObject

-discoverer.name.6 = Discover Java model from Java project - Incremental EMF vs Classical EMF

+discoverer.name = Discover Java model from Java project - Benchmark (Deprecated)

+discoverer.name.0 = Discover Java model from Java project - Incremental XMI + Trace (Deprecated)

+discoverer.name.1 = Discover Java model from Java project - Incremental XMI (Deprecated)

+discoverer.name.2 = Discover Java model from Java project - CDO (Not include server launch) (Deprecated)

+discoverer.name.3 = Discover Java model from Java project - CDO + NoUsages (Not include server launch) (Deprecated)

+discoverer.name.4 = Discover Java model from Java project - No Usages (Deprecated)

+discoverer.name.5 = Discover Java model from Java project - Minimal EObject (Deprecated)

+discoverer.name.6 = Discover Java model from Java project - Incremental EMF vs Classical EMF (Deprecated)

 extension.name = DerbyCDOServerNoAudits

 Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = MoDisco Java Discoverer Benchmark (Incubation)

-discoverer.name.7 = Discover Java model from Java project - CDO + Trace (Not include server launch)

-discoverer.name.8 = Discover Java model from Java project - Classical EMF

-discoverer.name.9 = Discover Java model from Java project - Incremental Classical EMF

-discoverer.name.10 = Generate benchmarck report from benchmark data project
\ No newline at end of file
+Bundle-Name = MoDisco Java Discoverer Benchmark (Deprecated) (Incubation)

+discoverer.name.7 = Discover Java model from Java project - CDO + Trace (Not include server launch) (Deprecated)

+discoverer.name.8 = Discover Java model from Java project - Classical EMF (Deprecated)

+discoverer.name.9 = Discover Java model from Java project - Incremental Classical EMF (Deprecated)

+discoverer.name.10 = Generate benchmarck report from benchmark data project (Deprecated)
\ No newline at end of file
diff --git a/org.eclipse.gmt.modisco.java.discoverer.benchmark/emtlCopy.build.xml b/org.eclipse.gmt.modisco.java.discoverer.benchmark/emtlCopy.build.xml
deleted file mode 100644
index 4fbd1de..0000000
--- a/org.eclipse.gmt.modisco.java.discoverer.benchmark/emtlCopy.build.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--

-Copyright (c) 2009 Mia-Software.

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

-    Gregoire DUPE (Mia-Software)

--->

-

-<project name="emtlCopy" default="emtlCopy">

-	<property name="htmlReport.emtl.dir" value="org/eclipse/gmt/modisco/java/discoverer/benchmark/template/html"></property>

-	<property name="htmlReport.emtl" value="${htmlReport.emtl.dir}/htmlReport.emtl"></property>

-	<target name="emtlCopy">

-		<copy file="${basedir}/bin/${htmlReport.emtl}" 

-			tofile="${basedir}/emtl/${htmlReport.emtl}"></copy>

-	</target>

-	<target name="emtlCopyBack">

-		<copy file="emtl/${htmlReport.emtl}" 

-			tofile="bin/${htmlReport.emtl}"></copy>

-	</target>

-</project>

diff --git a/org.eclipse.gmt.modisco.java.discoverer.benchmark/pom.xsl b/org.eclipse.gmt.modisco.java.discoverer.benchmark/pom.xsl
new file mode 100644
index 0000000..942d20d
--- /dev/null
+++ b/org.eclipse.gmt.modisco.java.discoverer.benchmark/pom.xsl
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!-- 

+Copyright (c) 2012, 2015 Mia-Software.

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

+    Grégoire Dupé (Mia-Software) - Bug 413749 - Missing GenerateJava.emtl file in modisco java generator plugin

+    Grégoire Dupé (Mia-Software) - Bug 468620 - [Unit Test Failure] org.eclipse.modisco.java.discoverer.benchmark.tests.JavaDiscovererBenchmarkTest.test001

+-->

+<xsl:stylesheet version="1.0"

+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common"

+	extension-element-prefixes="exsl" xmlns:m2="http://maven.apache.org/POM/4.0.0"

+	xmlns="http://maven.apache.org/POM/4.0.0">

+	<xsl:output indent="yes" />

+

+	<xsl:template match="/">

+		

+		<project

+			xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"

+			xmlns="http://maven.apache.org/POM/4.0.0"

+			xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

+			<xsl:apply-templates select="//m2:project/*[name()!='build']" />

+			<properties>

+				<eclipse-site>http://download.eclipse.org/releases/indigo</eclipse-site>

+				<platform-version>[3.7,3.8)</platform-version>

+			</properties>

+			<repositories>

+				<repository>

+					<id>Eclipse - Acceleo Snapshots</id>

+					<url>https://repo.eclipse.org/content/repositories/acceleo-snapshots</url>

+				</repository>

+				<repository>

+					<id>Eclipse - Acceleo Release</id>

+					<url>https://repo.eclipse.org/content/repositories/acceleo-releases</url>

+				</repository>

+			</repositories>

+		

+			<pluginRepositories>

+				<pluginRepository>

+					<id>Eclipse - Acceleo Snapshots</id>

+					<url>https://repo.eclipse.org/content/repositories/acceleo-snapshots</url>

+				</pluginRepository>

+				<pluginRepository>

+					<id>Eclipse - Acceleo Release</id>

+					<url>https://repo.eclipse.org/content/repositories/acceleo-releases</url>

+				</pluginRepository>

+			</pluginRepositories>

+

+			<dependencies>

+				<dependency>

+					<groupId>org.eclipse.acceleo</groupId>

+					<artifactId>org.eclipse.acceleo.maven</artifactId>

+					<version>3.5.0-SNAPSHOT</version>

+				</dependency>

+				<dependency>

+					<groupId>org.eclipse.acceleo</groupId>

+					<artifactId>org.eclipse.acceleo.engine</artifactId>

+					<version>3.5.0-SNAPSHOT</version>

+				</dependency>

+				<dependency>

+					<groupId>org.slf4j</groupId>

+					<artifactId>slf4j-simple</artifactId>

+					<version>1.6.4</version>

+				</dependency>

+			</dependencies>

+			

+			<build>

+				<plugins>

+					<xsl:copy-of select="//m2:project/build/plugins/*"/>

+					<plugin>

+						<groupId>org.eclipse.acceleo</groupId>

+						<artifactId>org.eclipse.acceleo.maven</artifactId>

+						<version>3.5.0-SNAPSHOT</version>

+						<executions>

+							<execution>

+								<goals>

+									<goal>acceleo-compile</goal>

+								</goals>

+								<phase>compile</phase>

+							</execution>

+						</executions>

+						<configuration>

+							<useBinaryResources>false</useBinaryResources>

+							<usePlatformResourcePath>true</usePlatformResourcePath>

+							<acceleoProject>

+								<root>${basedir}</root>

+								<entries>

+									<entry>

+										<input>src/</input>

+										<output>__target__/classes</output>

+									</entry>

+								</entries>

+								<jars>

+									<jar>p2.eclipse-plugin:org.eclipse.emf.ecore</jar>

+									<jar>org.eclipse.mdt:org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark</jar>

+									<jar>org.eclipse.mdt:org.eclipse.modisco.infra.discovery.benchmark</jar>

+								</jars>

+							</acceleoProject>

+							<packagesToRegister>

+								<packageToRegister>org.eclipse.emf.ecore.EcorePackage</packageToRegister>

+								<packageToRegister>org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark.JavaBenchmarkPackage</packageToRegister>

+								<packageToRegister>org.eclipse.modisco.infra.discovery.benchmark.BenchmarkPackage</packageToRegister>

+							</packagesToRegister>

+							<uriHandler>org.eclipse.acceleo.maven.AcceleoURIHandler</uriHandler>

+						</configuration>

+					</plugin>

+					<plugin>

+						<groupId>org.apache.maven.plugins</groupId>

+						<artifactId>maven-resources-plugin</artifactId>

+						<version>2.4.1</version>

+						<configuration>

+							<encoding>UTF-8</encoding>

+						</configuration>

+					</plugin>

+				</plugins>

+				<xsl:copy-of select="//m2:project/build/*[name()!='plugins']"/>

+			</build>

+		</project>

+	</xsl:template>

+

+	<xsl:template match="m2:*|@*">

+		<xsl:copy-of select="." />

+	</xsl:template>

+

+</xsl:stylesheet>

diff --git a/org.eclipse.gmt.modisco.java.discoverer.benchmark/src/org/eclipse/gmt/modisco/java/discoverer/benchmark/AbstractRunBenchmark.java b/org.eclipse.gmt.modisco.java.discoverer.benchmark/src/org/eclipse/gmt/modisco/java/discoverer/benchmark/AbstractRunBenchmark.java
index b9e0749..e92f358 100644
--- a/org.eclipse.gmt.modisco.java.discoverer.benchmark/src/org/eclipse/gmt/modisco/java/discoverer/benchmark/AbstractRunBenchmark.java
+++ b/org.eclipse.gmt.modisco.java.discoverer.benchmark/src/org/eclipse/gmt/modisco/java/discoverer/benchmark/AbstractRunBenchmark.java
@@ -52,7 +52,8 @@
 import com.ibm.icu.text.SimpleDateFormat;

 

 /**

- * @deprecated use org.eclipse.modisco.java.discoverer.benchmark component

+ * @deprecated use org.eclipse.modisco.java.discoverer.benchmark component,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728

  */

 @Deprecated

 public abstract class AbstractRunBenchmark implements Discoverer {

diff --git a/org.eclipse.gmt.modisco.java.discoverer.benchmark/src/org/eclipse/gmt/modisco/java/discoverer/benchmark/Activator.java b/org.eclipse.gmt.modisco.java.discoverer.benchmark/src/org/eclipse/gmt/modisco/java/discoverer/benchmark/Activator.java
index 55b8e5e..8ef05dd 100644
--- a/org.eclipse.gmt.modisco.java.discoverer.benchmark/src/org/eclipse/gmt/modisco/java/discoverer/benchmark/Activator.java
+++ b/org.eclipse.gmt.modisco.java.discoverer.benchmark/src/org/eclipse/gmt/modisco/java/discoverer/benchmark/Activator.java
@@ -17,7 +17,8 @@
 /**

  * The activator class controls the plug-in life cycle

  * 

- * @deprecated use org.eclipse.modisco.java.discoverer.benchmark component

+ * @deprecated use org.eclipse.modisco.java.discoverer.benchmark component,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728

  */

 @Deprecated

 public class Activator extends AbstractUIPlugin {

diff --git a/org.eclipse.gmt.modisco.java.discoverer.benchmark/src/org/eclipse/gmt/modisco/java/discoverer/benchmark/Messages.java b/org.eclipse.gmt.modisco.java.discoverer.benchmark/src/org/eclipse/gmt/modisco/java/discoverer/benchmark/Messages.java
index dc56c32..476f562 100644
--- a/org.eclipse.gmt.modisco.java.discoverer.benchmark/src/org/eclipse/gmt/modisco/java/discoverer/benchmark/Messages.java
+++ b/org.eclipse.gmt.modisco.java.discoverer.benchmark/src/org/eclipse/gmt/modisco/java/discoverer/benchmark/Messages.java
@@ -17,7 +17,8 @@
  * @author gdupe

  * 

  * 

- * @deprecated use org.eclipse.modisco.java.discoverer.benchmark component

+ * @deprecated use org.eclipse.modisco.java.discoverer.benchmark component,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728

  */

 @Deprecated

 public class Messages extends NLS {

diff --git a/org.eclipse.gmt.modisco.java.discoverer.benchmark/src/org/eclipse/gmt/modisco/java/discoverer/benchmark/Report.java b/org.eclipse.gmt.modisco.java.discoverer.benchmark/src/org/eclipse/gmt/modisco/java/discoverer/benchmark/Report.java
index da3efdb..386a65a 100644
--- a/org.eclipse.gmt.modisco.java.discoverer.benchmark/src/org/eclipse/gmt/modisco/java/discoverer/benchmark/Report.java
+++ b/org.eclipse.gmt.modisco.java.discoverer.benchmark/src/org/eclipse/gmt/modisco/java/discoverer/benchmark/Report.java
@@ -82,7 +82,8 @@
  * @author Gregoire DUPE (Mia-Software)

  * 

  * 

- * @deprecated use org.eclipse.modisco.java.discoverer.benchmark component

+ * @deprecated use org.eclipse.modisco.java.discoverer.benchmark component,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728

  */

 @Deprecated

 public class Report {

diff --git a/org.eclipse.gmt.modisco.java.discoverer.benchmark/src/org/eclipse/gmt/modisco/java/discoverer/benchmark/RunBenchmark.java b/org.eclipse.gmt.modisco.java.discoverer.benchmark/src/org/eclipse/gmt/modisco/java/discoverer/benchmark/RunBenchmark.java
index 73dfdb5..ba5c562 100644
--- a/org.eclipse.gmt.modisco.java.discoverer.benchmark/src/org/eclipse/gmt/modisco/java/discoverer/benchmark/RunBenchmark.java
+++ b/org.eclipse.gmt.modisco.java.discoverer.benchmark/src/org/eclipse/gmt/modisco/java/discoverer/benchmark/RunBenchmark.java
@@ -36,7 +36,8 @@
 import org.eclipse.modisco.infra.discovery.benchmark.MultiProjectBenchmark;

 

 /**

- * @deprecated use org.eclipse.modisco.java.discoverer.benchmark component

+ * @deprecated use org.eclipse.modisco.java.discoverer.benchmark component,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728

  */

 @Deprecated

 public class RunBenchmark extends AbstractRunBenchmark {

diff --git a/org.eclipse.gmt.modisco.java.discoverer.benchmark/src/org/eclipse/gmt/modisco/java/discoverer/benchmark/RunBenchmarkIncVsClassical.java b/org.eclipse.gmt.modisco.java.discoverer.benchmark/src/org/eclipse/gmt/modisco/java/discoverer/benchmark/RunBenchmarkIncVsClassical.java
index 6aa2f24..fe0b9ca 100644
--- a/org.eclipse.gmt.modisco.java.discoverer.benchmark/src/org/eclipse/gmt/modisco/java/discoverer/benchmark/RunBenchmarkIncVsClassical.java
+++ b/org.eclipse.gmt.modisco.java.discoverer.benchmark/src/org/eclipse/gmt/modisco/java/discoverer/benchmark/RunBenchmarkIncVsClassical.java
@@ -20,7 +20,8 @@
 import org.eclipse.jdt.core.IJavaProject;

 

 /**

- * @deprecated use org.eclipse.modisco.java.discoverer.benchmark component

+ * @deprecated use org.eclipse.modisco.java.discoverer.benchmark component,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728

  */

 @Deprecated

 public class RunBenchmarkIncVsClassical extends AbstractRunBenchmark {

diff --git a/org.eclipse.gmt.modisco.java.discoverer.benchmark/src/org/eclipse/gmt/modisco/java/discoverer/benchmark/actions/GenerateReportAction.java b/org.eclipse.gmt.modisco.java.discoverer.benchmark/src/org/eclipse/gmt/modisco/java/discoverer/benchmark/actions/GenerateReportAction.java
index 76246c6..68af17f 100644
--- a/org.eclipse.gmt.modisco.java.discoverer.benchmark/src/org/eclipse/gmt/modisco/java/discoverer/benchmark/actions/GenerateReportAction.java
+++ b/org.eclipse.gmt.modisco.java.discoverer.benchmark/src/org/eclipse/gmt/modisco/java/discoverer/benchmark/actions/GenerateReportAction.java
@@ -29,6 +29,11 @@
 import org.eclipse.gmt.modisco.java.discoverer.benchmark.Report;

 import org.eclipse.gmt.modisco.java.discoverer.benchmark.emfstat.Statistics;

 

+/**

+ * @deprecated Will be removed,

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728

+ */

+@Deprecated

 public class GenerateReportAction implements Discoverer {

 

 	@Deprecated

diff --git a/org.eclipse.gmt.modisco.java.discoverer.benchmark/src/org/eclipse/gmt/modisco/java/discoverer/benchmark/cdo/server/H2CDOServer.java b/org.eclipse.gmt.modisco.java.discoverer.benchmark/src/org/eclipse/gmt/modisco/java/discoverer/benchmark/cdo/server/H2CDOServer.java
index 59b8043..e3fa191 100644
--- a/org.eclipse.gmt.modisco.java.discoverer.benchmark/src/org/eclipse/gmt/modisco/java/discoverer/benchmark/cdo/server/H2CDOServer.java
+++ b/org.eclipse.gmt.modisco.java.discoverer.benchmark/src/org/eclipse/gmt/modisco/java/discoverer/benchmark/cdo/server/H2CDOServer.java
@@ -31,6 +31,11 @@
 import org.eclipse.net4j.db.IDBAdapter;

 import org.eclipse.net4j.db.h2.H2Adapter;

 

+/**

+ * @deprecated Will be removed,

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728

+ */

+@Deprecated

 public class H2CDOServer extends AbstractCDOServer {

 

 	@Override

diff --git a/org.eclipse.gmt.modisco.java.discoverer.benchmark/src/org/eclipse/gmt/modisco/java/discoverer/benchmark/template/html/HtmlReport.java b/org.eclipse.gmt.modisco.java.discoverer.benchmark/src/org/eclipse/gmt/modisco/java/discoverer/benchmark/template/html/HtmlReport.java
index 3641628..4231b83 100644
--- a/org.eclipse.gmt.modisco.java.discoverer.benchmark/src/org/eclipse/gmt/modisco/java/discoverer/benchmark/template/html/HtmlReport.java
+++ b/org.eclipse.gmt.modisco.java.discoverer.benchmark/src/org/eclipse/gmt/modisco/java/discoverer/benchmark/template/html/HtmlReport.java
@@ -28,7 +28,10 @@
  * Entry point of the 'HtmlReport' generation module.

  *

  * @generated

+ * @deprecated Will be removed,

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728

  */

+@Deprecated

 public class HtmlReport extends AbstractAcceleoGenerator {

 	/**

 	 * The name of the module.

diff --git a/org.eclipse.gmt.modisco.java.discoverer.cdo.tests/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.java.discoverer.cdo.tests/META-INF/MANIFEST.MF
index 3736c11..d8370c0 100644
--- a/org.eclipse.gmt.modisco.java.discoverer.cdo.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.java.discoverer.cdo.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.gmt.modisco.java.discoverer.cdo.tests;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.gmt.modisco.java.discoverer.cdo.tests.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.gmt.modisco.infra.discoverymanager;bundle-version="0.5.1",
diff --git a/org.eclipse.gmt.modisco.java.discoverer.cdo.tests/OSGI-INF/l10n/bundle.properties b/org.eclipse.gmt.modisco.java.discoverer.cdo.tests/OSGI-INF/l10n/bundle.properties
index c2a4141..09e0ff7 100644
--- a/org.eclipse.gmt.modisco.java.discoverer.cdo.tests/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.gmt.modisco.java.discoverer.cdo.tests/OSGI-INF/l10n/bundle.properties
@@ -10,4 +10,4 @@
 ###############################################################################

 #Properties file for org.eclipse.gmt.modisco.java.discoverer.cdo.tests

 Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = MoDisco Java CDO Discoverer tests (Incubation)
\ No newline at end of file
+Bundle-Name = MoDisco Java CDO Discoverer tests (Deprecated) (Incubation)
\ No newline at end of file
diff --git a/org.eclipse.gmt.modisco.java.discoverer.cdo/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.java.discoverer.cdo/META-INF/MANIFEST.MF
index ec19f06..1964127 100644
--- a/org.eclipse.gmt.modisco.java.discoverer.cdo/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.java.discoverer.cdo/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.gmt.modisco.java.discoverer.cdo
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.gmt.modisco.java.discoverer.cdo.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.gmt.modisco.infra.discoverymanager;bundle-version="0.5.1",
diff --git a/org.eclipse.gmt.modisco.java.discoverer.cdo/OSGI-INF/l10n/bundle.properties b/org.eclipse.gmt.modisco.java.discoverer.cdo/OSGI-INF/l10n/bundle.properties
index 2d02b55..ea3533a 100644
--- a/org.eclipse.gmt.modisco.java.discoverer.cdo/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.gmt.modisco.java.discoverer.cdo/OSGI-INF/l10n/bundle.properties
@@ -10,4 +10,4 @@
 ###############################################################################

 #Properties file for org.eclipse.gmt.modisco.java.discoverer.cdo

 Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = MoDisco CDO Java Discoverer (Incubation)
\ No newline at end of file
+Bundle-Name = MoDisco CDO Java Discoverer (Deprecated) (Incubation)
\ No newline at end of file
diff --git a/org.eclipse.gmt.modisco.java.discoverer.tests/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.java.discoverer.tests/META-INF/MANIFEST.MF
index 523ed70..eb1cd84 100644
--- a/org.eclipse.gmt.modisco.java.discoverer.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.java.discoverer.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %Bundle-Name

 Bundle-SymbolicName: org.eclipse.gmt.modisco.java.discoverer.tests;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-Activator: org.eclipse.gmt.modisco.java.discoverer.tests.Activator

 Bundle-Vendor: %Bundle-Vendor

 Require-Bundle: org.eclipse.gmt.modisco.infra.discoverymanager,

diff --git a/org.eclipse.gmt.modisco.java.discoverer.tests/OSGI-INF/l10n/bundle.properties b/org.eclipse.gmt.modisco.java.discoverer.tests/OSGI-INF/l10n/bundle.properties
index ef96dbc..3feb07a 100644
--- a/org.eclipse.gmt.modisco.java.discoverer.tests/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.gmt.modisco.java.discoverer.tests/OSGI-INF/l10n/bundle.properties
@@ -11,7 +11,7 @@
 

 #Properties file for org.eclipse.gmt.modisco.java.discoverer.tests

 Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = MoDisco Java Discoverer Tests  (Incubation)

-discoverer.trace = Discover Java model from Java project - Trace

-discoverer.simpleStat = Discover Java model from Java project - Simple stat

-discoverer.modelElementStats = Discover Java model from Java project - Model element stats
\ No newline at end of file
+Bundle-Name = MoDisco Java Discoverer Tests (Deprecated) (Incubation)

+discoverer.trace = Discover Java model from Java project - Trace (Deprecated)

+discoverer.simpleStat = Discover Java model from Java project - Simple stat (Deprecated)

+discoverer.modelElementStats = Discover Java model from Java project - Model element stats (Deprecated)
\ No newline at end of file
diff --git a/org.eclipse.gmt.modisco.java.discoverer/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.java.discoverer/META-INF/MANIFEST.MF
index 59492af..0e7c701 100644
--- a/org.eclipse.gmt.modisco.java.discoverer/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.java.discoverer/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-ActivationPolicy: lazy

 Bundle-Vendor: %Bundle-Vendor

 Bundle-SymbolicName: org.eclipse.gmt.modisco.java.discoverer;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

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

diff --git a/org.eclipse.gmt.modisco.java.discoverer/OSGI-INF/l10n/bundle.properties b/org.eclipse.gmt.modisco.java.discoverer/OSGI-INF/l10n/bundle.properties
index 09bcda8..d4fb3c7 100644
--- a/org.eclipse.gmt.modisco.java.discoverer/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.gmt.modisco.java.discoverer/OSGI-INF/l10n/bundle.properties
@@ -11,11 +11,11 @@
 

 #Properties file for org.eclipse.gmt.modisco.java.discoverer

 Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = MoDisco Java Discoverer (Incubation)

-discoverer.javaProject2KDM = Discover KDM code model from Java project...

-discoverer.javaProject2Model = Discover Java model from Java project...

-discoverer.classFile2Model = Discover Java model from Class file

-discoverer.library2Model = Discover Java model from Library

-discoverer.model2KDM = Discover KDM code model from Java model

-discoverer.name = Browse corresponding java code

-discoverer.name.0 = Browse corresponding java model element
\ No newline at end of file
+Bundle-Name = MoDisco Java Discoverer (Deprecated) (Incubation)

+discoverer.javaProject2KDM = Discover KDM code model from Java project... (Deprecated)

+discoverer.javaProject2Model = Discover Java model from Java project... (Deprecated)

+discoverer.classFile2Model = Discover Java model from Class file (Deprecated)

+discoverer.library2Model = Discover Java model from Library (Deprecated)

+discoverer.model2KDM = Discover KDM code model from Java model (Deprecated)

+discoverer.name = Browse corresponding java code (Deprecated)

+discoverer.name.0 = Browse corresponding java model element (Deprecated)
\ No newline at end of file
diff --git a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/IModelReader.java b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/IModelReader.java
index 2eef7dc..d759d69 100644
--- a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/IModelReader.java
+++ b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/IModelReader.java
@@ -17,7 +17,7 @@
  * The interface for readers which build Java models.

  * <p>

  * A model reader reads a source (a Java project for example) and fill a given

- * {@link Model} object. 

+ * {@link Model} object.

  * </p>

  * <p>

  * Concrete model readers should indicate which source type they can handle.

@@ -34,7 +34,9 @@
  * Clients shouldn't make modifications on the resulting {@code Model}.

  * </p>

  * 

- * @deprecated the whole plug-in is replaced by "org.eclipse.modisco.java.discoverer" (without the "gmt" part)

+ * @deprecated the whole plug-in is replaced by

+ *             "org.eclipse.modisco.java.discoverer" (without the "gmt" part),

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728

  */

 @Deprecated

 public interface IModelReader {

diff --git a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/JavaActivator.java b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/JavaActivator.java
index b0dfd3f..74172b2 100644
--- a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/JavaActivator.java
+++ b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/JavaActivator.java
@@ -22,7 +22,9 @@
 

 /**

  * The activator class controls the plug-in life cycle

- * @deprecated the whole plug-in is replaced by "org.eclipse.modisco.java.discoverer" (without the "gmt" part)

+ * @deprecated the whole plug-in is replaced by

+ *             "org.eclipse.modisco.java.discoverer" (without the "gmt" part),

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728

  */

 @Deprecated

 public class JavaActivator extends AbstractUIPlugin {

diff --git a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/Messages.java b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/Messages.java
index 0d002d7..919d6f1 100644
--- a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/Messages.java
+++ b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/Messages.java
@@ -13,7 +13,11 @@
 

 import org.eclipse.osgi.util.NLS;

 

-/** @deprecated the whole plug-in is replaced by "org.eclipse.modisco.java.discoverer" (without the "gmt" part) */

+/**

+ * @deprecated the whole plug-in is replaced by

+ *             "org.eclipse.modisco.java.discoverer" (without the "gmt" part),

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728

+ */

 @Deprecated

 public final class Messages extends NLS {

 	private static final String BUNDLE_NAME = "org.eclipse.gmt.modisco.java.messages"; //$NON-NLS-1$

diff --git a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/BrowseJavaCode.java b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/BrowseJavaCode.java
index 6f53be4..8cdc2a0 100644
--- a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/BrowseJavaCode.java
+++ b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/BrowseJavaCode.java
@@ -46,7 +46,9 @@
 

 /**

  * @author Gabriel Barbier

- * @deprecated the whole plug-in is replaced by "org.eclipse.modisco.java.discoverer" (without the "gmt" part)

+ * @deprecated the whole plug-in is replaced by

+ *             "org.eclipse.modisco.java.discoverer" (without the "gmt" part),

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728

  */

 @Deprecated

 public class BrowseJavaCode extends AbstractDiscovererImpl {

diff --git a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/BrowseJavaModel.java b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/BrowseJavaModel.java
index 3a2da99..7e8a6bd 100644
--- a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/BrowseJavaModel.java
+++ b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/BrowseJavaModel.java
@@ -45,7 +45,9 @@
 

 /**

  * @author Gabriel Barbier

- * @deprecated the whole plug-in is replaced by "org.eclipse.modisco.java.discoverer" (without the "gmt" part)

+ * @deprecated the whole plug-in is replaced by

+ *             "org.eclipse.modisco.java.discoverer" (without the "gmt" part),

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728

  */

 @Deprecated

 public class BrowseJavaModel extends AbstractDiscovererImpl {

diff --git a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/DefaultDiscoverer.java b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/DefaultDiscoverer.java
index 919089d..959605c 100644
--- a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/DefaultDiscoverer.java
+++ b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/DefaultDiscoverer.java
@@ -49,7 +49,9 @@
 

 /**

  * A default implementation of a discoverer suitable for subclassing.

- * @deprecated the whole plug-in is replaced by "org.eclipse.modisco.java.discoverer" (without the "gmt" part)

+ * @deprecated the whole plug-in is replaced by

+ *             "org.eclipse.modisco.java.discoverer" (without the "gmt" part),

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728

  */

 @Deprecated

 public abstract class DefaultDiscoverer extends AbstractRegionDiscoverer {

diff --git a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/DiscoverJavaModelFromClassFile.java b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/DiscoverJavaModelFromClassFile.java
index 632de1c..5b523d4 100644
--- a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/DiscoverJavaModelFromClassFile.java
+++ b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/DiscoverJavaModelFromClassFile.java
@@ -39,7 +39,9 @@
 

 /**

  * Action to discover a Java model from a a Java project.

- * @deprecated the whole plug-in is replaced by "org.eclipse.modisco.java.discoverer" (without the "gmt" part)

+ * @deprecated the whole plug-in is replaced by

+ *             "org.eclipse.modisco.java.discoverer" (without the "gmt" part),

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728

  */

 @Deprecated

 public class DiscoverJavaModelFromClassFile extends DefaultDiscoverer {

diff --git a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/DiscoverJavaModelFromJavaProject.java b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/DiscoverJavaModelFromJavaProject.java
index edf7099..dd1cff2 100644
--- a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/DiscoverJavaModelFromJavaProject.java
+++ b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/DiscoverJavaModelFromJavaProject.java
@@ -65,7 +65,9 @@
 /**

  * Action to discover a Java model from a Java project and optionally its

  * libraries.

- * @deprecated the whole plug-in is replaced by "org.eclipse.modisco.java.discoverer" (without the "gmt" part)

+ * @deprecated the whole plug-in is replaced by

+ *             "org.eclipse.modisco.java.discoverer" (without the "gmt" part),

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728

  */

 @Deprecated

 public class DiscoverJavaModelFromJavaProject extends DefaultDiscoverer {

diff --git a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/DiscoverJavaModelFromLibrary.java b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/DiscoverJavaModelFromLibrary.java
index 5949426..f217a32 100644
--- a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/DiscoverJavaModelFromLibrary.java
+++ b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/DiscoverJavaModelFromLibrary.java
@@ -42,7 +42,9 @@
  * Action to discover a Java model from a library of a Java project.

  * 

  * @see IPackageFragmentRoot

- * @deprecated the whole plug-in is replaced by "org.eclipse.modisco.java.discoverer" (without the "gmt" part)

+ * @deprecated the whole plug-in is replaced by

+ *             "org.eclipse.modisco.java.discoverer" (without the "gmt" part),

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728

  */

 @Deprecated

 public class DiscoverJavaModelFromLibrary extends DefaultDiscoverer {

diff --git a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/DiscoverKdmModelFromJavaModel.java b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/DiscoverKdmModelFromJavaModel.java
index 6bcdd4a..8c6f962 100644
--- a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/DiscoverKdmModelFromJavaModel.java
+++ b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/DiscoverKdmModelFromJavaModel.java
@@ -31,7 +31,11 @@
 import org.eclipse.gmt.modisco.infra.discoverymanager.DiscoveryParameterImpl;

 import org.eclipse.gmt.modisco.java.JavaActivator;

 import org.eclipse.gmt.modisco.java.Messages;

-/** @deprecated the whole plug-in is replaced by "org.eclipse.modisco.java.discoverer" (without the "gmt" part) */

+/** 

+ * @deprecated the whole plug-in is replaced by

+ *             "org.eclipse.modisco.java.discoverer" (without the "gmt" part),

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728 

+ */

 @Deprecated

 public class DiscoverKdmModelFromJavaModel extends DefaultDiscoverer {

 

diff --git a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/DiscoverKdmModelFromJavaProject.java b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/DiscoverKdmModelFromJavaProject.java
index 023d201..7d12fa6 100644
--- a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/DiscoverKdmModelFromJavaProject.java
+++ b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/DiscoverKdmModelFromJavaProject.java
@@ -32,7 +32,11 @@
 import org.eclipse.gmt.modisco.java.Messages;

 import org.eclipse.jdt.core.IJavaProject;

 import org.eclipse.jdt.core.JavaCore;

-/** @deprecated the whole plug-in is replaced by "org.eclipse.modisco.java.discoverer" (without the "gmt" part)*/

+/**

+ * @deprecated the whole plug-in is replaced by

+ *             "org.eclipse.modisco.java.discoverer" (without the "gmt" part),

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728

+ */

 @Deprecated

 public class DiscoverKdmModelFromJavaProject extends DefaultDiscoverer {

 

diff --git a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/DiscoveryParametersBean.java b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/DiscoveryParametersBean.java
index 99144e7..e5e0273 100644
--- a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/DiscoveryParametersBean.java
+++ b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/DiscoveryParametersBean.java
@@ -23,7 +23,9 @@
 

 /**

  * This Java bean stores some entries of advanced Java discovering.

- * @deprecated the whole plug-in is replaced by "org.eclipse.modisco.java.discoverer" (without the "gmt" part)

+ * @deprecated the whole plug-in is replaced by

+ *             "org.eclipse.modisco.java.discoverer" (without the "gmt" part),

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728

  */

 @Deprecated

 public class DiscoveryParametersBean {

diff --git a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/TransformationsExporter.java b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/TransformationsExporter.java
index 29207f5..7ae66e8 100644
--- a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/TransformationsExporter.java
+++ b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/TransformationsExporter.java
@@ -38,7 +38,9 @@
 

 /**

  * @author Gabriel Barbier

- * @deprecated the whole plug-in is replaced by "org.eclipse.modisco.java.discoverer" (without the "gmt" part)

+ * @deprecated the whole plug-in is replaced by

+ *             "org.eclipse.modisco.java.discoverer" (without the "gmt" part),

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728

  */

 @Deprecated

 public class TransformationsExporter extends AbstractDiscovererImpl {

diff --git a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/TranslateJavaModelToKdm.java b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/TranslateJavaModelToKdm.java
index 903bfdb..f63f4fb 100644
--- a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/TranslateJavaModelToKdm.java
+++ b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/TranslateJavaModelToKdm.java
@@ -21,7 +21,11 @@
 import org.eclipse.gmt.modisco.java.internal.core.AtlLaunchHelper;

 import org.eclipse.gmt.modisco.java.internal.core.AtlLaunchHelper.ModelInfo;

 import org.eclipse.m2m.atl.common.ATLLogger;

-/** @deprecated the whole plug-in is replaced by "org.eclipse.modisco.java.discoverer" (without the "gmt" part) */

+/**

+ * @deprecated the whole plug-in is replaced by

+ *             "org.eclipse.modisco.java.discoverer" (without the "gmt" part),

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728

+ */

 @Deprecated

 public class TranslateJavaModelToKdm {

 

diff --git a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/ui/JavaWizard.java b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/ui/JavaWizard.java
index 674a597..5c8525c 100644
--- a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/ui/JavaWizard.java
+++ b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/ui/JavaWizard.java
@@ -20,7 +20,9 @@
 

 /**

  * The Java discoverer wizard.

- * @deprecated the whole plug-in is replaced by "org.eclipse.modisco.java.discoverer" (without the "gmt" part)

+ *  * @deprecated the whole plug-in is replaced by

+ *             "org.eclipse.modisco.java.discoverer" (without the "gmt" part),

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728

  */

 @Deprecated

 public class JavaWizard extends Wizard {

diff --git a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/ui/JavaWizardFirstPage.java b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/ui/JavaWizardFirstPage.java
index dcd2da9..79681c1 100644
--- a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/ui/JavaWizardFirstPage.java
+++ b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/actions/ui/JavaWizardFirstPage.java
@@ -59,7 +59,9 @@
 

 /**

  * The page of the Java Wizard.

- * @deprecated the whole plug-in is replaced by "org.eclipse.modisco.java.discoverer" (without the "gmt" part)

+ * @deprecated the whole plug-in is replaced by

+ *             "org.eclipse.modisco.java.discoverer" (without the "gmt" part),

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728

  */

 @Deprecated

 public class JavaWizardFirstPage extends WizardPage {

diff --git a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/internal/core/AtlLaunchHelper.java b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/internal/core/AtlLaunchHelper.java
index 71745ec..44e5271 100644
--- a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/internal/core/AtlLaunchHelper.java
+++ b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/internal/core/AtlLaunchHelper.java
@@ -34,7 +34,9 @@
 

 /**

  * @author gbarbier

- * @deprecated the whole plug-in is replaced by "org.eclipse.modisco.java.discoverer" (without the "gmt" part)

+ * @deprecated the whole plug-in is replaced by

+ *             "org.eclipse.modisco.java.discoverer" (without the "gmt" part),

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728

  */

 @Deprecated

 public class AtlLaunchHelper {

diff --git a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/internal/core/JavaJdtBridge.java b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/internal/core/JavaJdtBridge.java
index 117ad9d..7cc07d7 100644
--- a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/internal/core/JavaJdtBridge.java
+++ b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/internal/core/JavaJdtBridge.java
@@ -42,7 +42,9 @@
 

 /**

  * @author Gabriel Barbier

- * @deprecated the whole plug-in is replaced by "org.eclipse.modisco.java.discoverer" (without the "gmt" part)

+ * @deprecated the whole plug-in is replaced by

+ *             "org.eclipse.modisco.java.discoverer" (without the "gmt" part),

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728

  */

 @Deprecated

 public class JavaJdtBridge {

diff --git a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/CommentsManager.java b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/CommentsManager.java
index 91a8381..ee8ccaa 100644
--- a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/CommentsManager.java
+++ b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/CommentsManager.java
@@ -35,7 +35,9 @@
 /**

  * The aim of this class is to link comments to the related nodes. JDT does not

  * attach comments (line and block comments) to model nodes.

- * @deprecated the whole plug-in is replaced by "org.eclipse.modisco.java.discoverer" (without the "gmt" part)

+ * @deprecated the whole plug-in is replaced by

+ *             "org.eclipse.modisco.java.discoverer" (without the "gmt" part),

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728

  */

 @Deprecated

 public final class CommentsManager {

diff --git a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/JDTVisitor.java b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/JDTVisitor.java
index bd4aee0..a52af7f 100644
--- a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/JDTVisitor.java
+++ b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/JDTVisitor.java
@@ -55,7 +55,9 @@
  * 

  * @see Model

  * @see ASTVisitor

- * @deprecated the whole plug-in is replaced by "org.eclipse.modisco.java.discoverer" (without the "gmt" part)

+ * @deprecated the whole plug-in is replaced by

+ *             "org.eclipse.modisco.java.discoverer" (without the "gmt" part),

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728

  */

 @Deprecated

 public class JDTVisitor extends ASTVisitor {

diff --git a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/JDTVisitorUtils.java b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/JDTVisitorUtils.java
index bdcfe0e..a1f0587 100644
--- a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/JDTVisitorUtils.java
+++ b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/JDTVisitorUtils.java
@@ -53,7 +53,11 @@
 

 /**

  * The class provides tools for the JDTVisitor.

- * @deprecated the whole plug-in is replaced by "org.eclipse.modisco.java.discoverer" (without the "gmt" part)

+ * @deprecated the whole plug-in is replaced by

+ *             "org.eclipse.modisco.java.discoverer" (without the "gmt" part),

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728 * @deprecated the whole plug-in is replaced by

+ *             "org.eclipse.modisco.java.discoverer" (without the "gmt" part),

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728

  */

 @Deprecated

 public final class JDTVisitorUtils {

diff --git a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/JavaReader.java b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/JavaReader.java
index 4399867..4b7ff78 100644
--- a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/JavaReader.java
+++ b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/JavaReader.java
@@ -73,7 +73,9 @@
  * 

  * @see LibraryReader

  * @see ASTParser

- * @deprecated the whole plug-in is replaced by "org.eclipse.modisco.java.discoverer" (without the "gmt" part)

+ * @deprecated the whole plug-in is replaced by

+ *             "org.eclipse.modisco.java.discoverer" (without the "gmt" part),

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728

  */

 @Deprecated

 public class JavaReader implements IModelReader {

diff --git a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/MethodRedefinitionManager.java b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/MethodRedefinitionManager.java
index e17f36d..da12149 100644
--- a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/MethodRedefinitionManager.java
+++ b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/MethodRedefinitionManager.java
@@ -32,7 +32,9 @@
 /**

  * The aim of this class is to bind method with the method overriden of a super

  * class if any

- * @deprecated the whole plug-in is replaced by "org.eclipse.modisco.java.discoverer" (without the "gmt" part)

+ * @deprecated the whole plug-in is replaced by

+ *             "org.eclipse.modisco.java.discoverer" (without the "gmt" part),

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728

  */

 @Deprecated

 public final class MethodRedefinitionManager {

diff --git a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/binding/BijectiveMap.java b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/binding/BijectiveMap.java
index d7df769..6f5c655 100644
--- a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/binding/BijectiveMap.java
+++ b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/binding/BijectiveMap.java
@@ -22,7 +22,9 @@
 

 /**

  * This class implements a parameterized bijective map

- * @deprecated the whole plug-in is replaced by "org.eclipse.modisco.java.discoverer" (without the "gmt" part)

+ * @deprecated the whole plug-in is replaced by

+ *             "org.eclipse.modisco.java.discoverer" (without the "gmt" part),

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728

  */

 @Deprecated

 public class BijectiveMap<Key, Value> {

diff --git a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/binding/Binding.java b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/binding/Binding.java
index 9a85f20..2b4e487 100644
--- a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/binding/Binding.java
+++ b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/binding/Binding.java
@@ -27,7 +27,9 @@
  * </p>

  * 

  * @see IBinding

- * @deprecated the whole plug-in is replaced by "org.eclipse.modisco.java.discoverer" (without the "gmt" part)

+ * @deprecated the whole plug-in is replaced by

+ *             "org.eclipse.modisco.java.discoverer" (without the "gmt" part),

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728

  */

 @Deprecated

 public class Binding {

diff --git a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/binding/BindingManager.java b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/binding/BindingManager.java
index 9da0fc9..21a8ed9 100644
--- a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/binding/BindingManager.java
+++ b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/binding/BindingManager.java
@@ -65,7 +65,9 @@
  * 

  * @see #resolveBindings(Model)

  * @see PendingElement#affectTarget(ASTNode)

- * @deprecated the whole plug-in is replaced by "org.eclipse.modisco.java.discoverer" (without the "gmt" part)

+ * @deprecated the whole plug-in is replaced by

+ *             "org.eclipse.modisco.java.discoverer" (without the "gmt" part),

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728

  */

 @Deprecated

 public class BindingManager {

diff --git a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/binding/ClassBinding.java b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/binding/ClassBinding.java
index af5089c..3621cac 100644
--- a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/binding/ClassBinding.java
+++ b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/binding/ClassBinding.java
@@ -25,7 +25,9 @@
  * {@code Binding} representing a type (Class, Interface, Annotation, or Enum).

  * 

  * @see ITypeBinding

- * @deprecated the whole plug-in is replaced by "org.eclipse.modisco.java.discoverer" (without the "gmt" part)

+ * @deprecated the whole plug-in is replaced by

+ *             "org.eclipse.modisco.java.discoverer" (without the "gmt" part),

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728

  */

 @Deprecated

 public class ClassBinding extends Binding {

diff --git a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/binding/FeatureBinding.java b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/binding/FeatureBinding.java
index 24491b6..78af470 100644
--- a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/binding/FeatureBinding.java
+++ b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/binding/FeatureBinding.java
@@ -18,7 +18,9 @@
 

 /**

  * <code>Binding</code> representing a featured Java entity.

- * @deprecated the whole plug-in is replaced by "org.eclipse.modisco.java.discoverer" (without the "gmt" part)

+ * @deprecated the whole plug-in is replaced by

+ *             "org.eclipse.modisco.java.discoverer" (without the "gmt" part),

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728

  */

 @Deprecated

 public abstract class FeatureBinding extends Binding {

diff --git a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/binding/FieldBinding.java b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/binding/FieldBinding.java
index 6e791c6..564b5d8 100644
--- a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/binding/FieldBinding.java
+++ b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/binding/FieldBinding.java
@@ -22,7 +22,9 @@
  * <code>Binding</code> representing a field.

  * 

  * @see IVariableBinding

- * @deprecated the whole plug-in is replaced by "org.eclipse.modisco.java.discoverer" (without the "gmt" part)

+ * @deprecated the whole plug-in is replaced by

+ *             "org.eclipse.modisco.java.discoverer" (without the "gmt" part),

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728

  */

 @Deprecated

 public class FieldBinding extends FeatureBinding {

diff --git a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/binding/IBindingFactory.java b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/binding/IBindingFactory.java
index 5a33a38..b4caf95 100644
--- a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/binding/IBindingFactory.java
+++ b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/binding/IBindingFactory.java
@@ -29,7 +29,9 @@
  * A Factory which creates MoDisco {@link Binding}s from JDT nodes.

  * 

  * @see org.eclipse.jdt.core.dom.ASTNode

- * @deprecated the whole plug-in is replaced by "org.eclipse.modisco.java.discoverer" (without the "gmt" part)

+ * @deprecated the whole plug-in is replaced by

+ *             "org.eclipse.modisco.java.discoverer" (without the "gmt" part),

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728

  */

 @Deprecated

 public interface IBindingFactory {

diff --git a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/binding/JDTDelegateBindingFactory.java b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/binding/JDTDelegateBindingFactory.java
index 0f8e73f..deed7c7 100644
--- a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/binding/JDTDelegateBindingFactory.java
+++ b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/binding/JDTDelegateBindingFactory.java
@@ -39,7 +39,9 @@
  * 

  * @see IBinding

  * @see ASTParser#setResolveBindings(boolean)

- * @deprecated the whole plug-in is replaced by "org.eclipse.modisco.java.discoverer" (without the "gmt" part)

+ * @deprecated the whole plug-in is replaced by

+ *             "org.eclipse.modisco.java.discoverer" (without the "gmt" part),

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728

  */

 @Deprecated

 public final class JDTDelegateBindingFactory implements IBindingFactory {

diff --git a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/binding/MethodBinding.java b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/binding/MethodBinding.java
index 749e820..0bc5ae6 100644
--- a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/binding/MethodBinding.java
+++ b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/binding/MethodBinding.java
@@ -25,7 +25,9 @@
  * <code>Binding</code> representing a Java method.

  * 

  * @see IMethodBinding

- * @deprecated the whole plug-in is replaced by "org.eclipse.modisco.java.discoverer" (without the "gmt" part)

+ * @deprecated the whole plug-in is replaced by

+ *             "org.eclipse.modisco.java.discoverer" (without the "gmt" part),

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728

  */

 @Deprecated

 public class MethodBinding extends FeatureBinding {

diff --git a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/binding/PackageBinding.java b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/binding/PackageBinding.java
index c949006..c647ac2 100644
--- a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/binding/PackageBinding.java
+++ b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/binding/PackageBinding.java
@@ -22,7 +22,9 @@
  * {@code Binding} representing a Java package.

  * 

  * @see IPackageBinding

- * @deprecated the whole plug-in is replaced by "org.eclipse.modisco.java.discoverer" (without the "gmt" part)

+ * @deprecated the whole plug-in is replaced by

+ *             "org.eclipse.modisco.java.discoverer" (without the "gmt" part),

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728

  */

 @Deprecated

 public class PackageBinding extends Binding {

diff --git a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/binding/PendingElement.java b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/binding/PendingElement.java
index 5a59f8c..b25d4fc 100644
--- a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/binding/PendingElement.java
+++ b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/binding/PendingElement.java
@@ -57,7 +57,9 @@
  * This class implements the meta-class {@code ASTNode} but is <b>not</b> modeled in the Java meta-model.

  * It is a trick to ease the usage of this class in the {@code JDTVisitor}.

  * </p>

- * @deprecated the whole plug-in is replaced by "org.eclipse.modisco.java.discoverer" (without the "gmt" part)

+ * @deprecated the whole plug-in is replaced by

+ *             "org.eclipse.modisco.java.discoverer" (without the "gmt" part),

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728

  */

 @Deprecated

 public class PendingElement implements ASTNode {

diff --git a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/binding/VariableBinding.java b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/binding/VariableBinding.java
index 85f5255..8fbb41f 100644
--- a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/binding/VariableBinding.java
+++ b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/java/binding/VariableBinding.java
@@ -22,7 +22,9 @@
  * {@code Binding} representing a local variable.

  * 

  * @see IVariableBinding

- * @deprecated the whole plug-in is replaced by "org.eclipse.modisco.java.discoverer" (without the "gmt" part)

+ * @deprecated the whole plug-in is replaced by

+ *             "org.eclipse.modisco.java.discoverer" (without the "gmt" part),

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728

  */

 @Deprecated

 public class VariableBinding extends Binding {

diff --git a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/library/ClassFileParser.java b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/library/ClassFileParser.java
index a99ca71..1d99496 100644
--- a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/library/ClassFileParser.java
+++ b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/library/ClassFileParser.java
@@ -78,7 +78,9 @@
  * of {@link IClassFile class files}.

  * 

  * @see Model

- * @deprecated the whole plug-in is replaced by "org.eclipse.modisco.java.discoverer" (without the "gmt" part)

+ * @deprecated the whole plug-in is replaced by

+ *             "org.eclipse.modisco.java.discoverer" (without the "gmt" part),

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728

  */

 @Deprecated

 public class ClassFileParser {

diff --git a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/library/ClassFileParserUtils.java b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/library/ClassFileParserUtils.java
index 7a190a4..9e3fa7d 100644
--- a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/library/ClassFileParserUtils.java
+++ b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/library/ClassFileParserUtils.java
@@ -25,7 +25,9 @@
 

 /**

  * The class provides tools for the ClassFileParser.

- * @deprecated the whole plug-in is replaced by "org.eclipse.modisco.java.discoverer" (without the "gmt" part)

+ * @deprecated the whole plug-in is replaced by

+ *             "org.eclipse.modisco.java.discoverer" (without the "gmt" part),

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728

  */

 @Deprecated

 public final class ClassFileParserUtils {

diff --git a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/library/LibraryReader.java b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/library/LibraryReader.java
index bfe77af..600a4b1 100644
--- a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/library/LibraryReader.java
+++ b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/library/LibraryReader.java
@@ -64,7 +64,9 @@
  * creation of the model from the sources, relying on a {@code JavaReader}.

  * </p>

  * @see JavaReader

- * @deprecated the whole plug-in is replaced by "org.eclipse.modisco.java.discoverer" (without the "gmt" part)

+ * @deprecated the whole plug-in is replaced by

+ *             "org.eclipse.modisco.java.discoverer" (without the "gmt" part),

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728

  */

 @Deprecated

 public class LibraryReader implements IModelReader {

diff --git a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/library/TypeFinder.java b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/library/TypeFinder.java
index 00df7f0..da2af40 100644
--- a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/library/TypeFinder.java
+++ b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/library/TypeFinder.java
@@ -23,7 +23,9 @@
 /**

  * Class which act as a cache to faster the resolution of a {@link IType} from a

  * dot based qualified name in the context of a Java project.

- * @deprecated the whole plug-in is replaced by "org.eclipse.modisco.java.discoverer" (without the "gmt" part)

+ * @deprecated the whole plug-in is replaced by

+ *             "org.eclipse.modisco.java.discoverer" (without the "gmt" part),

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728

  */

 @Deprecated

 public class TypeFinder {

diff --git a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/library/binding/JavaModelDelegateBindingFactory.java b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/library/binding/JavaModelDelegateBindingFactory.java
index 3e474de..e2ae1a2 100644
--- a/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/library/binding/JavaModelDelegateBindingFactory.java
+++ b/org.eclipse.gmt.modisco.java.discoverer/src/org/eclipse/gmt/modisco/java/io/library/binding/JavaModelDelegateBindingFactory.java
@@ -38,7 +38,9 @@
 

 /**

  * A factory which uses the Java Model API to build MoDisco {@link Binding}s.

- * @deprecated the whole plug-in is replaced by "org.eclipse.modisco.java.discoverer" (without the "gmt" part)

+ * @deprecated the whole plug-in is replaced by

+ *             "org.eclipse.modisco.java.discoverer" (without the "gmt" part),

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470728

  */

 @Deprecated

 public final class JavaModelDelegateBindingFactory {

diff --git a/org.eclipse.gmt.modisco.java.generation/.project b/org.eclipse.gmt.modisco.java.generation/.project
index bb046ef..8d34253 100644
--- a/org.eclipse.gmt.modisco.java.generation/.project
+++ b/org.eclipse.gmt.modisco.java.generation/.project
@@ -30,32 +30,6 @@
 			<arguments>

 			</arguments>

 		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.buckminster.ant.AntBuilder</name>

-			<triggers>auto,full,incremental,</triggers>

-			<arguments>

-				<dictionary>

-					<key>script.file</key>

-					<value>emtlCopy.build.xml</value>

-				</dictionary>

-				<dictionary>

-					<key>auto.kind.target</key>

-					<value>emtlCopyBack</value>

-				</dictionary>

-				<dictionary>

-					<key>incremental.kind.target</key>

-					<value>emtlCopyBack</value>

-				</dictionary>

-				<dictionary>

-					<key>full.kind.target</key>

-					<value>emtlCopyBack</value>

-				</dictionary>

-				<dictionary>

-					<key>build.result.folder</key>

-					<value>.</value>

-				</dictionary>

-			</arguments>

-		</buildCommand>

 	</buildSpec>

 	<natures>

 		<nature>org.eclipse.acceleo.ide.ui.acceleoNature</nature>

diff --git a/org.eclipse.gmt.modisco.java.generation/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.java.generation/META-INF/MANIFEST.MF
index 49eee87..8aeb366 100644
--- a/org.eclipse.gmt.modisco.java.generation/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.java.generation/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %Bundle-Name

 Bundle-SymbolicName: org.eclipse.gmt.modisco.java.generation;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-Activator: org.eclipse.gmt.modisco.java.generation.Activator

 Bundle-Vendor: %Bundle-Vendor

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

diff --git a/org.eclipse.gmt.modisco.java.generation/OSGI-INF/l10n/bundle.properties b/org.eclipse.gmt.modisco.java.generation/OSGI-INF/l10n/bundle.properties
index 7cffe60..31a6aa6 100644
--- a/org.eclipse.gmt.modisco.java.generation/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.gmt.modisco.java.generation/OSGI-INF/l10n/bundle.properties
@@ -12,4 +12,4 @@
 #Properties file for org.eclipse.gmt.modisco.java.generation

 Bundle-Vendor = Eclipse Modeling Project

 Bundle-Name = MoDisco Java Code Generator (Incubation)

-discoverer.name = Generate Java code from Java Model
\ No newline at end of file
+discoverer.name = Generate Java code from Java Model (Deprecated)
\ No newline at end of file
diff --git a/org.eclipse.gmt.modisco.java.generation/pom.xsl b/org.eclipse.gmt.modisco.java.generation/pom.xsl
index 7dc17f9..f47c5ba 100644
--- a/org.eclipse.gmt.modisco.java.generation/pom.xsl
+++ b/org.eclipse.gmt.modisco.java.generation/pom.xsl
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<!-- Copyright (c) 2012 Mia-Software. -->

+<!-- Copyright (c) 2012, 2015 Mia-Software. -->

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

 <!-- Grégoire Dupé (Mia-Software) - Bug 413749 - Missing GenerateJava.emtl file in modisco java generator plugin -->

+<!-- Grégoire Dupé (Mia-Software) - Bug 468685 - [Unit Test Failure] org.eclipse.modisco.java.generation.tests.TestGlobal001.test001  -->

 <xsl:stylesheet version="1.0"

 	xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common"

 	extension-element-prefixes="exsl" xmlns:m2="http://maven.apache.org/POM/4.0.0"

@@ -25,53 +26,36 @@
 			</properties>

 			<repositories>

 				<repository>

-					<id>eclipse-platform</id>

-					<layout>p2</layout>

-					<url>${eclipse-site}</url>

+					<id>Eclipse - Acceleo Snapshots</id>

+					<url>https://repo.eclipse.org/content/repositories/acceleo-snapshots</url>

 				</repository>

 				<repository>

-					<id>Indigo Release</id>

-					<url>https://raw.github.com/eclipse/acceleo/master/maven/repository/releases/indigo</url>

-				</repository>

-				<repository>

-					<id>Juno Release</id>

-					<url>https://raw.github.com/eclipse/acceleo/master/maven/repository/releases/juno</url>

-				</repository>

-				<repository>

-					<id>Snapshots</id>

-					<url>https://raw.github.com/eclipse/acceleo/master/maven/repository/snapshots</url>

+					<id>Eclipse - Acceleo Release</id>

+					<url>https://repo.eclipse.org/content/repositories/acceleo-releases</url>

 				</repository>

 			</repositories>

-			

+		

 			<pluginRepositories>

 				<pluginRepository>

-					<id>codehaus.snapshots</id>

-					<url>http://snapshots.repository.codehaus.org/</url>

+					<id>Eclipse - Acceleo Snapshots</id>

+					<url>https://repo.eclipse.org/content/repositories/acceleo-snapshots</url>

 				</pluginRepository>

 				<pluginRepository>

-					<id>Indigo Release</id>

-					<url>https://raw.github.com/eclipse/acceleo/master/maven/repository/releases/indigo</url>

-				</pluginRepository>

-				<pluginRepository>

-					<id>Juno Release</id>

-					<url>https://raw.github.com/eclipse/acceleo/master/maven/repository/releases/juno</url>

-				</pluginRepository>

-				<pluginRepository>

-					<id>Snapshots</id>

-					<url>https://raw.github.com/eclipse/acceleo/master/maven/repository/snapshots</url>

+					<id>Eclipse - Acceleo Release</id>

+					<url>https://repo.eclipse.org/content/repositories/acceleo-releases</url>

 				</pluginRepository>

 			</pluginRepositories>

-			

+

 			<dependencies>

 				<dependency>

 					<groupId>org.eclipse.acceleo</groupId>

-					<artifactId>maven</artifactId>

-					<version>3.2.1</version>

+					<artifactId>org.eclipse.acceleo.maven</artifactId>

+					<version>3.5.0-SNAPSHOT</version>

 				</dependency>

 				<dependency>

 					<groupId>org.eclipse.acceleo</groupId>

-					<artifactId>engine</artifactId>

-					<version>3.2.1</version>

+					<artifactId>org.eclipse.acceleo.engine</artifactId>

+					<version>3.5.0-SNAPSHOT</version>

 				</dependency>

 				<dependency>

 					<groupId>org.slf4j</groupId>

@@ -85,8 +69,8 @@
 					<xsl:copy-of select="//m2:project/build/plugins/*"/>

 					<plugin>

 						<groupId>org.eclipse.acceleo</groupId>

-						<artifactId>maven</artifactId>

-						<version>3.2.1</version>

+						<artifactId>org.eclipse.acceleo.maven</artifactId>

+						<version>3.5.0-SNAPSHOT</version>

 						<executions>

 							<execution>

 								<goals>

@@ -106,8 +90,13 @@
 										<output>__target__/classes</output>

 									</entry>

 								</entries>

+								<jars>

+									<jar>p2.eclipse-plugin:org.eclipse.emf.ecore</jar>
+									<jar>org.eclipse.mdt:org.eclipse.gmt.modisco.java</jar>

+								</jars>

 							</acceleoProject>

 							<packagesToRegister>

+								<packageToRegister>org.eclipse.emf.ecore.EcorePackage</packageToRegister>

 								<packageToRegister>org.eclipse.gmt.modisco.java.emf.JavaPackage</packageToRegister>

 							</packagesToRegister>

 							<uriHandler>org.eclipse.acceleo.maven.AcceleoURIHandler</uriHandler>

diff --git a/org.eclipse.gmt.modisco.java.generation/src/org/eclipse/gmt/modisco/java/generation/actions/GenerateJavaModel.java b/org.eclipse.gmt.modisco.java.generation/src/org/eclipse/gmt/modisco/java/generation/actions/GenerateJavaModel.java
index 4dba4da..d515f5a 100644
--- a/org.eclipse.gmt.modisco.java.generation/src/org/eclipse/gmt/modisco/java/generation/actions/GenerateJavaModel.java
+++ b/org.eclipse.gmt.modisco.java.generation/src/org/eclipse/gmt/modisco/java/generation/actions/GenerateJavaModel.java
@@ -33,6 +33,12 @@
 import org.eclipse.gmt.modisco.java.generation.Activator;

 import org.eclipse.gmt.modisco.java.generation.files.GenerateJava;

 

+/**

+ * @deprecated This class implements a deprecated interface. It must re-written

+ *             using the new discoverer framework. cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=470896

+ */

+@Deprecated

 public class GenerateJavaModel extends AbstractDiscovererImpl {

 

 	private final DiscoveryParameter generationTargetFolder;

diff --git a/org.eclipse.gmt.modisco.java.generation/src/org/eclipse/gmt/modisco/java/generation/files/GenerateJava.java b/org.eclipse.gmt.modisco.java.generation/src/org/eclipse/gmt/modisco/java/generation/files/GenerateJava.java
index 5391bf3..3cde2a7 100644
--- a/org.eclipse.gmt.modisco.java.generation/src/org/eclipse/gmt/modisco/java/generation/files/GenerateJava.java
+++ b/org.eclipse.gmt.modisco.java.generation/src/org/eclipse/gmt/modisco/java/generation/files/GenerateJava.java
@@ -319,10 +319,10 @@
      * 
      * @param propertiesFile
      *            The properties file to add.
-     * @generated
+     * @generated NOT
      * @since 3.1
-     */
-    @Override
+     */

+	//@Override gdupe> Commented to be able to build aginst Helios
     public void addPropertiesFile(String propertiesFile) {
         this.propertiesFiles.add(propertiesFile);
     }

@@ -411,4 +411,13 @@
         // resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(UMLResource.FILE_EXTENSION, UMLResource.Factory.INSTANCE);
     }

 	

+	/**

+	 * @generated NOT

+	 */

+	@Override

+	protected URI createTemplateURI(final String entry) {

+		return URI.createURI(entry);

+	}

+

+	

 }

diff --git a/org.eclipse.gmt.modisco.java.generation/src/org/eclipse/gmt/modisco/java/generation/files/Messages.java b/org.eclipse.gmt.modisco.java.generation/src/org/eclipse/gmt/modisco/java/generation/files/Messages.java
index 6dff0ba..938e6f9 100644
--- a/org.eclipse.gmt.modisco.java.generation/src/org/eclipse/gmt/modisco/java/generation/files/Messages.java
+++ b/org.eclipse.gmt.modisco.java.generation/src/org/eclipse/gmt/modisco/java/generation/files/Messages.java
@@ -12,6 +12,11 @@
 

 import org.eclipse.osgi.util.NLS;

 

+/**

+ * @deprecated Will be removed,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470701

+ */

+@Deprecated

 public class Messages extends NLS {

 	private static final String BUNDLE_NAME = "org.eclipse.gmt.modisco.java.generation.files.messages"; //$NON-NLS-1$

 	public static String GenerateJava_0;

diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.java.nousages.cdo/META-INF/MANIFEST.MF
index 50afd6c..4bca7cd 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %pluginName

 Bundle-SymbolicName: org.eclipse.gmt.modisco.java.nousages.cdo;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-ClassPath: .

 Bundle-Vendor: %providerName

 Bundle-Localization: plugin

diff --git a/org.eclipse.gmt.modisco.java.nousages/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.java.nousages/META-INF/MANIFEST.MF
index 56e0c9a..9ef3efb 100644
--- a/org.eclipse.gmt.modisco.java.nousages/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.java.nousages/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %pluginName

 Bundle-SymbolicName: org.eclipse.gmt.modisco.java.nousages;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-ClassPath: .

 Bundle-Vendor: %providerName

 Bundle-Localization: plugin

diff --git a/org.eclipse.gmt.modisco.java.queries/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.java.queries/META-INF/MANIFEST.MF
index 98d5deb..43f3acd 100644
--- a/org.eclipse.gmt.modisco.java.queries/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.java.queries/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.gmt.modisco.java.queries;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.gmt.modisco.java/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.java/META-INF/MANIFEST.MF
index 3016cda..132bc76 100644
--- a/org.eclipse.gmt.modisco.java/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.java/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %Bundle-Name

 Bundle-SymbolicName: org.eclipse.gmt.modisco.java;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-ClassPath: .

 Bundle-Vendor: %Bundle-Vendor

 Bundle-Localization: plugin

diff --git a/org.eclipse.gmt.modisco.kdm.browser.extension/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.kdm.browser.extension/META-INF/MANIFEST.MF
index fc46ec8..090be05 100644
--- a/org.eclipse.gmt.modisco.kdm.browser.extension/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.kdm.browser.extension/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.gmt.modisco.kdm.browser.extension;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.gmt.modisco.kdm.browser.extension.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/org.eclipse.gmt.modisco.kdm.source.discoverer/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.kdm.source.discoverer/META-INF/MANIFEST.MF
index 257c8d9..2139c48 100644
--- a/org.eclipse.gmt.modisco.kdm.source.discoverer/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.kdm.source.discoverer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %pluginName

 Bundle-SymbolicName: org.eclipse.gmt.modisco.kdm.source.discoverer;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-Activator: org.eclipse.gmt.modisco.kdm.source.discoverer.plugin.Activator

 Bundle-Vendor: %providerName

 Bundle-ClassPath: .

diff --git a/org.eclipse.gmt.modisco.kdm.source.discoverer/plugin.properties b/org.eclipse.gmt.modisco.kdm.source.discoverer/plugin.properties
index 3f5c873..c5681bd 100644
--- a/org.eclipse.gmt.modisco.kdm.source.discoverer/plugin.properties
+++ b/org.eclipse.gmt.modisco.kdm.source.discoverer/plugin.properties
@@ -9,7 +9,7 @@
 #    Gabriel Barbier (Mia-Software) - initial API and implementation

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

 # NLS_MESSAGEFORMAT_VAR

-pluginName=MoDisco KDM Source Discoverer (Incubation)

+pluginName=MoDisco KDM Source Discoverer (Deprecated) (Incubation)

 providerName=Eclipse Modeling Project

 

 content-type.name = Text File (Modisco)

@@ -57,4 +57,4 @@
 content-type.name.41 = Build Properties File

 content-type.name.42 = Ant Buildfile

 content-type.name.43 = Image File

-discoverer.name = Discover KDM Source Model from Container
\ No newline at end of file
+discoverer.name = Discover KDM Source Model from Container (Deprecated)
\ No newline at end of file
diff --git a/org.eclipse.gmt.modisco.kdm.source.discoverer/src/org/eclipse/gmt/modisco/kdm/source/discoverer/KDMSourceDiscoverer.java b/org.eclipse.gmt.modisco.kdm.source.discoverer/src/org/eclipse/gmt/modisco/kdm/source/discoverer/KDMSourceDiscoverer.java
index 1e48341..30374b5 100644
--- a/org.eclipse.gmt.modisco.kdm.source.discoverer/src/org/eclipse/gmt/modisco/kdm/source/discoverer/KDMSourceDiscoverer.java
+++ b/org.eclipse.gmt.modisco.kdm.source.discoverer/src/org/eclipse/gmt/modisco/kdm/source/discoverer/KDMSourceDiscoverer.java
@@ -34,7 +34,8 @@
  * Some services for building a basic file system representation, based on Source sub package from

  * KDM metamodel.

  * 

- * @deprecated the whole plug-in is replaced by org.eclipse.modisco.kdm.source.discoverer

+ * @deprecated the whole plug-in is replaced by org.eclipse.modisco.kdm.source.discoverer, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=474727

  */

 @Deprecated

 public class KDMSourceDiscoverer {

diff --git a/org.eclipse.gmt.modisco.kdm.source.discoverer/src/org/eclipse/gmt/modisco/kdm/source/discoverer/Messages.java b/org.eclipse.gmt.modisco.kdm.source.discoverer/src/org/eclipse/gmt/modisco/kdm/source/discoverer/Messages.java
index c36351f..6a0a495 100644
--- a/org.eclipse.gmt.modisco.kdm.source.discoverer/src/org/eclipse/gmt/modisco/kdm/source/discoverer/Messages.java
+++ b/org.eclipse.gmt.modisco.kdm.source.discoverer/src/org/eclipse/gmt/modisco/kdm/source/discoverer/Messages.java
@@ -14,7 +14,8 @@
 

 /**

  * @author gdupe

- * @deprecated the whole plug-in is replaced by org.eclipse.modisco.kdm.source.discoverer

+ * @deprecated the whole plug-in is replaced by org.eclipse.modisco.kdm.source.discoverer,

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=474727

  */

 @Deprecated

 public class Messages extends NLS {

diff --git a/org.eclipse.gmt.modisco.kdm.source.discoverer/src/org/eclipse/gmt/modisco/kdm/source/discoverer/actions/DiscoverSourceModelFromContainer.java b/org.eclipse.gmt.modisco.kdm.source.discoverer/src/org/eclipse/gmt/modisco/kdm/source/discoverer/actions/DiscoverSourceModelFromContainer.java
index a6a8d4a..bc186e2 100644
--- a/org.eclipse.gmt.modisco.kdm.source.discoverer/src/org/eclipse/gmt/modisco/kdm/source/discoverer/actions/DiscoverSourceModelFromContainer.java
+++ b/org.eclipse.gmt.modisco.kdm.source.discoverer/src/org/eclipse/gmt/modisco/kdm/source/discoverer/actions/DiscoverSourceModelFromContainer.java
@@ -42,7 +42,8 @@
 /**

  * @author Gabriel Barbier

  * @deprecated Use instead DiscoverSourceModelFromJavaElement or DiscoverSourceModelFromResource in

- *             plug-in org.eclipse.modisco.kdm.source.discoverer.

+ *             plug-in org.eclipse.modisco.kdm.source.discoverer,

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=474727

  */

 @Deprecated

 public class DiscoverSourceModelFromContainer implements Discoverer {

diff --git a/org.eclipse.gmt.modisco.kdm.source.discoverer/src/org/eclipse/gmt/modisco/kdm/source/discoverer/actions/DiscoverSourceModelFromJavaProject.java b/org.eclipse.gmt.modisco.kdm.source.discoverer/src/org/eclipse/gmt/modisco/kdm/source/discoverer/actions/DiscoverSourceModelFromJavaProject.java
index f69b23f..0f7e394 100644
--- a/org.eclipse.gmt.modisco.kdm.source.discoverer/src/org/eclipse/gmt/modisco/kdm/source/discoverer/actions/DiscoverSourceModelFromJavaProject.java
+++ b/org.eclipse.gmt.modisco.kdm.source.discoverer/src/org/eclipse/gmt/modisco/kdm/source/discoverer/actions/DiscoverSourceModelFromJavaProject.java
@@ -44,7 +44,8 @@
 /**

  * @author Gabriel Barbier

  * @deprecated Use instead DiscoverSourceModelFromJavaElement or DiscoverSourceModelFromResource in

- *             plug-in org.eclipse.modisco.kdm.source.discoverer.

+ *             plug-in org.eclipse.modisco.kdm.source.discoverer,

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=474727

  */

 @Deprecated

 public class DiscoverSourceModelFromJavaProject implements Discoverer {

diff --git a/org.eclipse.gmt.modisco.kdm.source.discoverer/src/org/eclipse/gmt/modisco/kdm/source/discoverer/messages.properties b/org.eclipse.gmt.modisco.kdm.source.discoverer/src/org/eclipse/gmt/modisco/kdm/source/discoverer/messages.properties
index 750a9c5..16e6c6e 100644
--- a/org.eclipse.gmt.modisco.kdm.source.discoverer/src/org/eclipse/gmt/modisco/kdm/source/discoverer/messages.properties
+++ b/org.eclipse.gmt.modisco.kdm.source.discoverer/src/org/eclipse/gmt/modisco/kdm/source/discoverer/messages.properties
@@ -8,5 +8,5 @@
 # Contributors:

 #    Gabriel Barbier (Mia-Software) - initial API and implementation

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

-DiscoverSourceModelFromContainer_0=Discover KDM source model from container

-DiscoverSourceModelFromJavaProject_4=Discover KDM source model from Java project

+DiscoverSourceModelFromContainer_0=Discover KDM source model from container (Deprecated)

+DiscoverSourceModelFromJavaProject_4=Discover KDM source model from Java project (Deprecated)

diff --git a/org.eclipse.gmt.modisco.kdm.source.discoverer/src/org/eclipse/gmt/modisco/kdm/source/discoverer/plugin/Activator.java b/org.eclipse.gmt.modisco.kdm.source.discoverer/src/org/eclipse/gmt/modisco/kdm/source/discoverer/plugin/Activator.java
index 6c49613..5def833 100644
--- a/org.eclipse.gmt.modisco.kdm.source.discoverer/src/org/eclipse/gmt/modisco/kdm/source/discoverer/plugin/Activator.java
+++ b/org.eclipse.gmt.modisco.kdm.source.discoverer/src/org/eclipse/gmt/modisco/kdm/source/discoverer/plugin/Activator.java
@@ -17,7 +17,8 @@
 /**

  * The activator class controls the plug-in life cycle

  * 

- * @deprecated the whole plug-in is replaced by org.eclipse.modisco.kdm.source.discoverer

+ * @deprecated the whole plug-in is replaced by org.eclipse.modisco.kdm.source.discoverer,

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=474727

  */

 @Deprecated

 public class Activator extends AbstractUIPlugin {

diff --git a/org.eclipse.gmt.modisco.kdm.uml2converter.tests/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.kdm.uml2converter.tests/META-INF/MANIFEST.MF
index 6a46b86..eb184db 100644
--- a/org.eclipse.gmt.modisco.kdm.uml2converter.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.kdm.uml2converter.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.gmt.modisco.kdm.uml2converter.tests;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui,
  org.eclipse.gmt.modisco.kdm.uml2converter,
diff --git a/org.eclipse.gmt.modisco.kdm.uml2converter.tests/OSGI-INF/l10n/bundle.properties b/org.eclipse.gmt.modisco.kdm.uml2converter.tests/OSGI-INF/l10n/bundle.properties
index 8dc5255..d6611c8 100644
--- a/org.eclipse.gmt.modisco.kdm.uml2converter.tests/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.gmt.modisco.kdm.uml2converter.tests/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,3 @@
 #Properties file for org.eclipse.gmt.modisco.kdm.uml2converter.tests

 Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = MoDisco KDMtoUML2 Converter Tests (Incubation)
\ No newline at end of file
+Bundle-Name = MoDisco KDMtoUML2 Converter Tests (Deprecated) (Incubation)
\ No newline at end of file
diff --git a/org.eclipse.gmt.modisco.kdm.uml2converter.tests/src/org/eclipse/gmt/modisco/kdm/uml2converter/tests/Activator.java b/org.eclipse.gmt.modisco.kdm.uml2converter.tests/src/org/eclipse/gmt/modisco/kdm/uml2converter/tests/Activator.java
index 76e72fe..84699ce 100644
--- a/org.eclipse.gmt.modisco.kdm.uml2converter.tests/src/org/eclipse/gmt/modisco/kdm/uml2converter/tests/Activator.java
+++ b/org.eclipse.gmt.modisco.kdm.uml2converter.tests/src/org/eclipse/gmt/modisco/kdm/uml2converter/tests/Activator.java
@@ -19,7 +19,8 @@
 /**

  * The activator class controls the plug-in life cycle

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=474827

  */

 @Deprecated

 public class Activator extends AbstractUIPlugin {

diff --git a/org.eclipse.gmt.modisco.kdm.uml2converter.tests/src/org/eclipse/gmt/modisco/kdm/uml2converter/tests/AllTestsInUIThread.java b/org.eclipse.gmt.modisco.kdm.uml2converter.tests/src/org/eclipse/gmt/modisco/kdm/uml2converter/tests/AllTestsInUIThread.java
index d79414a..b5d9449 100644
--- a/org.eclipse.gmt.modisco.kdm.uml2converter.tests/src/org/eclipse/gmt/modisco/kdm/uml2converter/tests/AllTestsInUIThread.java
+++ b/org.eclipse.gmt.modisco.kdm.uml2converter.tests/src/org/eclipse/gmt/modisco/kdm/uml2converter/tests/AllTestsInUIThread.java
@@ -17,7 +17,8 @@
 import org.junit.runners.Suite.SuiteClasses;

 

 /**

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component,

+ *             cf.https://bugs.eclipse.org/bugs/show_bug.cgi?id=474827

  */

 @Deprecated

 @RunWith(Suite.class)

diff --git a/org.eclipse.gmt.modisco.kdm.uml2converter.tests/src/org/eclipse/gmt/modisco/kdm/uml2converter/tests/AtlProjectFactory.java b/org.eclipse.gmt.modisco.kdm.uml2converter.tests/src/org/eclipse/gmt/modisco/kdm/uml2converter/tests/AtlProjectFactory.java
index b0c71bd..229e1a2 100644
--- a/org.eclipse.gmt.modisco.kdm.uml2converter.tests/src/org/eclipse/gmt/modisco/kdm/uml2converter/tests/AtlProjectFactory.java
+++ b/org.eclipse.gmt.modisco.kdm.uml2converter.tests/src/org/eclipse/gmt/modisco/kdm/uml2converter/tests/AtlProjectFactory.java
@@ -30,7 +30,8 @@
  * @author Gabriel Barbier

  * 

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=474827

  */

 @Deprecated

 public class AtlProjectFactory {

diff --git a/org.eclipse.gmt.modisco.kdm.uml2converter.tests/src/org/eclipse/gmt/modisco/kdm/uml2converter/tests/HotTransformationTest.java b/org.eclipse.gmt.modisco.kdm.uml2converter.tests/src/org/eclipse/gmt/modisco/kdm/uml2converter/tests/HotTransformationTest.java
index 4527fa5..c9534c6 100644
--- a/org.eclipse.gmt.modisco.kdm.uml2converter.tests/src/org/eclipse/gmt/modisco/kdm/uml2converter/tests/HotTransformationTest.java
+++ b/org.eclipse.gmt.modisco.kdm.uml2converter.tests/src/org/eclipse/gmt/modisco/kdm/uml2converter/tests/HotTransformationTest.java
@@ -37,7 +37,8 @@
  * @author Gabriel Barbier

  * 

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=474827

  */

 @Deprecated

 public class HotTransformationTest {

diff --git a/org.eclipse.gmt.modisco.kdm.uml2converter.tests/src/org/eclipse/gmt/modisco/kdm/uml2converter/tests/KdmToUml2ConverterTest.java b/org.eclipse.gmt.modisco.kdm.uml2converter.tests/src/org/eclipse/gmt/modisco/kdm/uml2converter/tests/KdmToUml2ConverterTest.java
index b81c290..a6ff6a0 100644
--- a/org.eclipse.gmt.modisco.kdm.uml2converter.tests/src/org/eclipse/gmt/modisco/kdm/uml2converter/tests/KdmToUml2ConverterTest.java
+++ b/org.eclipse.gmt.modisco.kdm.uml2converter.tests/src/org/eclipse/gmt/modisco/kdm/uml2converter/tests/KdmToUml2ConverterTest.java
@@ -36,7 +36,8 @@
  * @author Gabriel Barbier

  * 

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=474827

  */

 @Deprecated

 public class KdmToUml2ConverterTest {

diff --git a/org.eclipse.gmt.modisco.kdm.uml2converter.tests/src/org/eclipse/gmt/modisco/kdm/uml2converter/tests/KdmToUml2WithTracesConverterTest.java b/org.eclipse.gmt.modisco.kdm.uml2converter.tests/src/org/eclipse/gmt/modisco/kdm/uml2converter/tests/KdmToUml2WithTracesConverterTest.java
index 63232f6..d739be5 100644
--- a/org.eclipse.gmt.modisco.kdm.uml2converter.tests/src/org/eclipse/gmt/modisco/kdm/uml2converter/tests/KdmToUml2WithTracesConverterTest.java
+++ b/org.eclipse.gmt.modisco.kdm.uml2converter.tests/src/org/eclipse/gmt/modisco/kdm/uml2converter/tests/KdmToUml2WithTracesConverterTest.java
@@ -34,7 +34,8 @@
  * @author Gabriel Barbier

  *

  *

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=474827

  */

 @Deprecated

 public class KdmToUml2WithTracesConverterTest {

diff --git a/org.eclipse.gmt.modisco.kdm.uml2converter/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.kdm.uml2converter/META-INF/MANIFEST.MF
index 906ba4c..a53000d 100644
--- a/org.eclipse.gmt.modisco.kdm.uml2converter/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.kdm.uml2converter/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.gmt.modisco.kdm.uml2converter;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.gmt.modisco.kdm.uml2converter.KdmToUml2Activator
 Bundle-Vendor: %providerName
 Bundle-ClassPath: .
diff --git a/org.eclipse.gmt.modisco.kdm.uml2converter/plugin.properties b/org.eclipse.gmt.modisco.kdm.uml2converter/plugin.properties
index f9a36b7..e62e49f 100644
--- a/org.eclipse.gmt.modisco.kdm.uml2converter/plugin.properties
+++ b/org.eclipse.gmt.modisco.kdm.uml2converter/plugin.properties
@@ -9,11 +9,11 @@
 #    Gabriel Barbier (Mia-Software) - initial API and implementation

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

 # NLS_MESSAGEFORMAT_VAR

-pluginName=MoDisco KDM to UML2 conversion (Incubation)

+pluginName=MoDisco KDM to UML2 conversion (Deprecated) (Incubation)

 providerName=Eclipse Modeling Project

 

-menu.label = MoDisco Modelplex Knowledge Discovery

-menu.label.0 = Intermediate models

-action.label = Export KDM to UML2 transformation

-action.label.0 = Convert to UML2 Model with custom transformation

-discoverer.name = Discover UML model from KDM model
\ No newline at end of file
+menu.label = MoDisco Modelplex Knowledge Discovery (Deprecated)

+menu.label.0 = Intermediate models (Deprecated)

+action.label = Export KDM to UML2 transformation (Deprecated)

+action.label.0 = Convert to UML2 Model with custom transformation (Deprecated)

+discoverer.name = Discover UML model from KDM model (Deprecated)
\ No newline at end of file
diff --git a/org.eclipse.gmt.modisco.kdm.uml2converter/src/org/eclipse/gmt/modisco/kdm/uml2converter/KdmToUml2Activator.java b/org.eclipse.gmt.modisco.kdm.uml2converter/src/org/eclipse/gmt/modisco/kdm/uml2converter/KdmToUml2Activator.java
index 7f85289..95bcc0d 100644
--- a/org.eclipse.gmt.modisco.kdm.uml2converter/src/org/eclipse/gmt/modisco/kdm/uml2converter/KdmToUml2Activator.java
+++ b/org.eclipse.gmt.modisco.kdm.uml2converter/src/org/eclipse/gmt/modisco/kdm/uml2converter/KdmToUml2Activator.java
@@ -18,7 +18,8 @@
 import org.osgi.framework.BundleContext;

 

 /**

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=474827

  */

 @Deprecated

 public class KdmToUml2Activator extends AbstractUIPlugin {

diff --git a/org.eclipse.gmt.modisco.kdm.uml2converter/src/org/eclipse/gmt/modisco/kdm/uml2converter/KdmToUmlConverter.java b/org.eclipse.gmt.modisco.kdm.uml2converter/src/org/eclipse/gmt/modisco/kdm/uml2converter/KdmToUmlConverter.java
index 1880445..eb3645f 100644
--- a/org.eclipse.gmt.modisco.kdm.uml2converter/src/org/eclipse/gmt/modisco/kdm/uml2converter/KdmToUmlConverter.java
+++ b/org.eclipse.gmt.modisco.kdm.uml2converter/src/org/eclipse/gmt/modisco/kdm/uml2converter/KdmToUmlConverter.java
@@ -27,7 +27,8 @@
  * @author Gabriel Barbier

  * 

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=474827

  */

 @Deprecated

 public interface KdmToUmlConverter {

diff --git a/org.eclipse.gmt.modisco.kdm.uml2converter/src/org/eclipse/gmt/modisco/kdm/uml2converter/actions/DiscoverUmlModelFromKdmModel.java b/org.eclipse.gmt.modisco.kdm.uml2converter/src/org/eclipse/gmt/modisco/kdm/uml2converter/actions/DiscoverUmlModelFromKdmModel.java
index 773e85b..a26bcf6 100644
--- a/org.eclipse.gmt.modisco.kdm.uml2converter/src/org/eclipse/gmt/modisco/kdm/uml2converter/actions/DiscoverUmlModelFromKdmModel.java
+++ b/org.eclipse.gmt.modisco.kdm.uml2converter/src/org/eclipse/gmt/modisco/kdm/uml2converter/actions/DiscoverUmlModelFromKdmModel.java
@@ -42,7 +42,8 @@
  * @author Gabriel Barbier

  * 

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=474827

  */

 @Deprecated

 public class DiscoverUmlModelFromKdmModel extends AbstractDiscovererImpl implements Discoverer {

diff --git a/org.eclipse.gmt.modisco.kdm.uml2converter/src/org/eclipse/gmt/modisco/kdm/uml2converter/impl/AtlLaunchHelper.java b/org.eclipse.gmt.modisco.kdm.uml2converter/src/org/eclipse/gmt/modisco/kdm/uml2converter/impl/AtlLaunchHelper.java
index c8a8db3..bdc6df9 100644
--- a/org.eclipse.gmt.modisco.kdm.uml2converter/src/org/eclipse/gmt/modisco/kdm/uml2converter/impl/AtlLaunchHelper.java
+++ b/org.eclipse.gmt.modisco.kdm.uml2converter/src/org/eclipse/gmt/modisco/kdm/uml2converter/impl/AtlLaunchHelper.java
@@ -37,7 +37,8 @@
  * @author gbarbier

  * 

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component,

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=474827

  */

 @Deprecated

 public class AtlLaunchHelper {

diff --git a/org.eclipse.gmt.modisco.kdm.uml2converter/src/org/eclipse/gmt/modisco/kdm/uml2converter/impl/KdmtoUmlConverterImpl.java b/org.eclipse.gmt.modisco.kdm.uml2converter/src/org/eclipse/gmt/modisco/kdm/uml2converter/impl/KdmtoUmlConverterImpl.java
index 657860f..9eaecba 100644
--- a/org.eclipse.gmt.modisco.kdm.uml2converter/src/org/eclipse/gmt/modisco/kdm/uml2converter/impl/KdmtoUmlConverterImpl.java
+++ b/org.eclipse.gmt.modisco.kdm.uml2converter/src/org/eclipse/gmt/modisco/kdm/uml2converter/impl/KdmtoUmlConverterImpl.java
@@ -59,7 +59,8 @@
 import org.eclipse.ui.ide.IDE;

 

 /**

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=474827

  */

 @Deprecated

 public class KdmtoUmlConverterImpl implements KdmToUmlConverter {

diff --git a/org.eclipse.gmt.modisco.kdm.uml2converter/src/org/eclipse/gmt/modisco/kdm/uml2converter/popup/actions/Convert.java b/org.eclipse.gmt.modisco.kdm.uml2converter/src/org/eclipse/gmt/modisco/kdm/uml2converter/popup/actions/Convert.java
index 61decb8..d4b6fc6 100644
--- a/org.eclipse.gmt.modisco.kdm.uml2converter/src/org/eclipse/gmt/modisco/kdm/uml2converter/popup/actions/Convert.java
+++ b/org.eclipse.gmt.modisco.kdm.uml2converter/src/org/eclipse/gmt/modisco/kdm/uml2converter/popup/actions/Convert.java
@@ -45,6 +45,10 @@
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.ide.IDE;
 
+/**
+ * @deprecated cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=474827
+ */
+@Deprecated
 public class Convert implements IObjectActionDelegate {
 
 	private final Logger logger = Logger.getLogger(ATLLogger.LOGGER_ID);
diff --git a/org.eclipse.gmt.modisco.kdm.uml2converter/src/org/eclipse/gmt/modisco/kdm/uml2converter/popup/actions/ConvertWithCustomTransformation.java b/org.eclipse.gmt.modisco.kdm.uml2converter/src/org/eclipse/gmt/modisco/kdm/uml2converter/popup/actions/ConvertWithCustomTransformation.java
index a8c615f..0435ebe 100644
--- a/org.eclipse.gmt.modisco.kdm.uml2converter/src/org/eclipse/gmt/modisco/kdm/uml2converter/popup/actions/ConvertWithCustomTransformation.java
+++ b/org.eclipse.gmt.modisco.kdm.uml2converter/src/org/eclipse/gmt/modisco/kdm/uml2converter/popup/actions/ConvertWithCustomTransformation.java
@@ -55,6 +55,10 @@
 import org.eclipse.ui.model.WorkbenchLabelProvider;
 import org.eclipse.gmt.modisco.kdm.uml2converter.Messages;
 
+/**
+ * @deprecated cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=474827
+ */
+@Deprecated
 public class ConvertWithCustomTransformation implements IObjectActionDelegate {
 
 	private final Logger logger = Logger.getLogger(ATLLogger.LOGGER_ID);
diff --git a/org.eclipse.gmt.modisco.kdm.uml2converter/src/org/eclipse/gmt/modisco/kdm/uml2converter/popup/actions/ConvertWithTraces.java b/org.eclipse.gmt.modisco.kdm.uml2converter/src/org/eclipse/gmt/modisco/kdm/uml2converter/popup/actions/ConvertWithTraces.java
index acacd07..9bb70b1 100644
--- a/org.eclipse.gmt.modisco.kdm.uml2converter/src/org/eclipse/gmt/modisco/kdm/uml2converter/popup/actions/ConvertWithTraces.java
+++ b/org.eclipse.gmt.modisco.kdm.uml2converter/src/org/eclipse/gmt/modisco/kdm/uml2converter/popup/actions/ConvertWithTraces.java
@@ -39,6 +39,10 @@
 import org.eclipse.ui.IWorkbenchPart;

 import org.eclipse.gmt.modisco.kdm.uml2converter.Messages;

 

+/**

+ * @deprecated cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=474827

+ */

+@Deprecated

 public class ConvertWithTraces implements IObjectActionDelegate {

 

 	private final Logger logger = Logger.getLogger(ATLLogger.LOGGER_ID);

diff --git a/org.eclipse.gmt.modisco.kdm.uml2converter/src/org/eclipse/gmt/modisco/kdm/uml2converter/popup/actions/ExportTransformation.java b/org.eclipse.gmt.modisco.kdm.uml2converter/src/org/eclipse/gmt/modisco/kdm/uml2converter/popup/actions/ExportTransformation.java
index 63d0b80..eacf3a7 100644
--- a/org.eclipse.gmt.modisco.kdm.uml2converter/src/org/eclipse/gmt/modisco/kdm/uml2converter/popup/actions/ExportTransformation.java
+++ b/org.eclipse.gmt.modisco.kdm.uml2converter/src/org/eclipse/gmt/modisco/kdm/uml2converter/popup/actions/ExportTransformation.java
@@ -26,6 +26,10 @@
 import org.eclipse.ui.IWorkbenchPart;

 import org.eclipse.ui.dialogs.SaveAsDialog;

 

+/**

+ * @deprecated cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=474827

+ */

+@Deprecated

 public class ExportTransformation implements IObjectActionDelegate {

 

 	private IProject containingProject;

diff --git a/org.eclipse.gmt.modisco.omg.kdm/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.omg.kdm/META-INF/MANIFEST.MF
index d8003e9..a8c663e 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.omg.kdm/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %pluginName

 Bundle-SymbolicName: org.eclipse.gmt.modisco.omg.kdm;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-ClassPath: .

 Bundle-Vendor: %providerName

 Bundle-Localization: plugin

diff --git a/org.eclipse.gmt.modisco.omg.smm/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.omg.smm/META-INF/MANIFEST.MF
index 87ef896..ff84f6e 100644
--- a/org.eclipse.gmt.modisco.omg.smm/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.omg.smm/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %pluginName

 Bundle-SymbolicName: org.eclipse.gmt.modisco.omg.smm;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-ClassPath: .

 Bundle-Vendor: %providerName

 Bundle-Localization: plugin

diff --git a/org.eclipse.gmt.modisco.tool.metricsvisualizationbuilder/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.tool.metricsvisualizationbuilder/META-INF/MANIFEST.MF
index 7052b64..1211b65 100644
--- a/org.eclipse.gmt.modisco.tool.metricsvisualizationbuilder/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.tool.metricsvisualizationbuilder/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %pluginName

 Bundle-SymbolicName: org.eclipse.gmt.modisco.tool.metricsvisualizationbuilder

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-Vendor: %providerName

 Bundle-ClassPath: .

 Bundle-Localization: plugin

diff --git a/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/META-INF/MANIFEST.MF
index 1a42218..fa68095 100644
--- a/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.gmt.modisco.usecase.modelfilter.dependencies;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.gmt.modisco.usecase.modelfilter.dependencies.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/OSGI-INF/l10n/bundle.properties b/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/OSGI-INF/l10n/bundle.properties
index b8b6239..96b9e70 100644
--- a/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/OSGI-INF/l10n/bundle.properties
@@ -10,12 +10,12 @@
 ###############################################################################

 #Properties file for org.eclipse.gmt.modisco.usecase.modelfilter.dependencies

 Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = MoDisco Modelfilter Method Calls Discoverer (Incubation)

+Bundle-Name = MoDisco Modelfilter Method Calls Discoverer (Deprecated) (Incubation)

 

-content-type.name = Model of method calls

-discoverer.name = Discover dependencies from type declaration

-discoverer.name.0 = Discover dependencies from Java model

-discoverer.name.1 = Discover dependencies from Java project

-discoverer.name.2 = Discover dependencies from Java Type

-discoverer.name.3 = Discover dependencies from Java Package

-editor.name = Dependencies as prefuse graph
\ No newline at end of file
+content-type.name = Model of method calls (Deprecated)

+discoverer.name = Discover dependencies from type declaration (Deprecated)

+discoverer.name.0 = Discover dependencies from Java model (Deprecated)

+discoverer.name.1 = Discover dependencies from Java project (Deprecated)

+discoverer.name.2 = Discover dependencies from Java Type (Deprecated)

+discoverer.name.3 = Discover dependencies from Java Package (Deprecated)

+editor.name = Dependencies as prefuse graph (Deprecated)
\ No newline at end of file
diff --git a/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/src/org/eclipse/gmt/modisco/usecase/modelfilter/dependencies/Activator.java b/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/src/org/eclipse/gmt/modisco/usecase/modelfilter/dependencies/Activator.java
index c8caa07..9aa5be5 100644
--- a/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/src/org/eclipse/gmt/modisco/usecase/modelfilter/dependencies/Activator.java
+++ b/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/src/org/eclipse/gmt/modisco/usecase/modelfilter/dependencies/Activator.java
@@ -16,6 +16,10 @@
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
 
+/**
+ * @deprecated use matching org.eclipse.modisco.x.y.z component,
+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470806
+ */
 public class Activator extends AbstractUIPlugin {
 	// The plug-in ID
 	public static final String PLUGIN_ID = "org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls"; //$NON-NLS-1$
diff --git a/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/src/org/eclipse/gmt/modisco/usecase/modelfilter/dependencies/actions/DiscoverDependenciesFromJavaModel.java b/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/src/org/eclipse/gmt/modisco/usecase/modelfilter/dependencies/actions/DiscoverDependenciesFromJavaModel.java
index 1eed4fe..a50f312 100644
--- a/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/src/org/eclipse/gmt/modisco/usecase/modelfilter/dependencies/actions/DiscoverDependenciesFromJavaModel.java
+++ b/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/src/org/eclipse/gmt/modisco/usecase/modelfilter/dependencies/actions/DiscoverDependenciesFromJavaModel.java
@@ -39,7 +39,8 @@
  * @author Gabriel Barbier

  * 

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470806

  */

 @Deprecated

 public class DiscoverDependenciesFromJavaModel extends AbstractDiscovererImpl implements Discoverer {

diff --git a/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/src/org/eclipse/gmt/modisco/usecase/modelfilter/dependencies/actions/DiscoverDependenciesFromJavaProject.java b/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/src/org/eclipse/gmt/modisco/usecase/modelfilter/dependencies/actions/DiscoverDependenciesFromJavaProject.java
index 628aaa3..94cede8 100644
--- a/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/src/org/eclipse/gmt/modisco/usecase/modelfilter/dependencies/actions/DiscoverDependenciesFromJavaProject.java
+++ b/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/src/org/eclipse/gmt/modisco/usecase/modelfilter/dependencies/actions/DiscoverDependenciesFromJavaProject.java
@@ -38,7 +38,8 @@
  * @author Gabriel Barbier

  * 

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470806

  */

 @Deprecated

 public class DiscoverDependenciesFromJavaProject extends AbstractDiscovererImpl implements

diff --git a/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/src/org/eclipse/gmt/modisco/usecase/modelfilter/dependencies/actions/DiscoverDependenciesFromJdtPackage.java b/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/src/org/eclipse/gmt/modisco/usecase/modelfilter/dependencies/actions/DiscoverDependenciesFromJdtPackage.java
index 3f369ff..5753f33 100644
--- a/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/src/org/eclipse/gmt/modisco/usecase/modelfilter/dependencies/actions/DiscoverDependenciesFromJdtPackage.java
+++ b/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/src/org/eclipse/gmt/modisco/usecase/modelfilter/dependencies/actions/DiscoverDependenciesFromJdtPackage.java
@@ -38,7 +38,8 @@
  * @author Gabriel Barbier

  * 

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470806

  */

 @Deprecated

 public class DiscoverDependenciesFromJdtPackage extends AbstractDiscovererImpl implements

diff --git a/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/src/org/eclipse/gmt/modisco/usecase/modelfilter/dependencies/actions/DiscoverDependenciesFromJdtType.java b/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/src/org/eclipse/gmt/modisco/usecase/modelfilter/dependencies/actions/DiscoverDependenciesFromJdtType.java
index 5a3f26c..80ebdf0 100644
--- a/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/src/org/eclipse/gmt/modisco/usecase/modelfilter/dependencies/actions/DiscoverDependenciesFromJdtType.java
+++ b/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/src/org/eclipse/gmt/modisco/usecase/modelfilter/dependencies/actions/DiscoverDependenciesFromJdtType.java
@@ -39,7 +39,8 @@
  * @author Gabriel Barbier

  * 

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470806

  */

 @Deprecated

 public class DiscoverDependenciesFromJdtType extends AbstractDiscovererImpl implements Discoverer {

diff --git a/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/src/org/eclipse/gmt/modisco/usecase/modelfilter/dependencies/actions/DiscoverDependenciesFromTypeDeclaration.java b/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/src/org/eclipse/gmt/modisco/usecase/modelfilter/dependencies/actions/DiscoverDependenciesFromTypeDeclaration.java
index 1a431f6..3bfcc4b 100644
--- a/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/src/org/eclipse/gmt/modisco/usecase/modelfilter/dependencies/actions/DiscoverDependenciesFromTypeDeclaration.java
+++ b/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/src/org/eclipse/gmt/modisco/usecase/modelfilter/dependencies/actions/DiscoverDependenciesFromTypeDeclaration.java
@@ -42,7 +42,8 @@
  * @author Gabriel Barbier

  * 

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470806

  */

 @Deprecated

 public class DiscoverDependenciesFromTypeDeclaration extends AbstractDiscovererImpl implements

diff --git a/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/src/org/eclipse/gmt/modisco/usecase/modelfilter/dependencies/actions/Messages.java b/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/src/org/eclipse/gmt/modisco/usecase/modelfilter/dependencies/actions/Messages.java
index d93fa28..4dd3131 100644
--- a/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/src/org/eclipse/gmt/modisco/usecase/modelfilter/dependencies/actions/Messages.java
+++ b/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/src/org/eclipse/gmt/modisco/usecase/modelfilter/dependencies/actions/Messages.java
@@ -17,7 +17,8 @@
  * @author GBarbier

  * 

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470806

  */

 @Deprecated

 public class Messages extends NLS {

diff --git a/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/src/org/eclipse/gmt/modisco/usecase/modelfilter/dependencies/editor/DependenciesEditor.java b/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/src/org/eclipse/gmt/modisco/usecase/modelfilter/dependencies/editor/DependenciesEditor.java
index 8661bcc..cd52b54 100644
--- a/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/src/org/eclipse/gmt/modisco/usecase/modelfilter/dependencies/editor/DependenciesEditor.java
+++ b/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/src/org/eclipse/gmt/modisco/usecase/modelfilter/dependencies/editor/DependenciesEditor.java
@@ -58,7 +58,8 @@
  * @author Gabriel Barbier

  * 

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470806

  */

 @Deprecated

 public class DependenciesEditor extends EditorPart {

diff --git a/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/src/org/eclipse/gmt/modisco/usecase/modelfilter/dependencies/editor/GetUsedPackages.java b/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/src/org/eclipse/gmt/modisco/usecase/modelfilter/dependencies/editor/GetUsedPackages.java
index d152a92..c3f44ae 100644
--- a/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/src/org/eclipse/gmt/modisco/usecase/modelfilter/dependencies/editor/GetUsedPackages.java
+++ b/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/src/org/eclipse/gmt/modisco/usecase/modelfilter/dependencies/editor/GetUsedPackages.java
@@ -24,7 +24,8 @@
  * @author Gabriel Barbier

  * 

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470806

  */

 @Deprecated

 public class GetUsedPackages {

diff --git a/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/src/org/eclipse/gmt/modisco/usecase/modelfilter/dependencies/editor/GetUsedTypes.java b/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/src/org/eclipse/gmt/modisco/usecase/modelfilter/dependencies/editor/GetUsedTypes.java
index 2b92ab4..a71e891 100644
--- a/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/src/org/eclipse/gmt/modisco/usecase/modelfilter/dependencies/editor/GetUsedTypes.java
+++ b/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/src/org/eclipse/gmt/modisco/usecase/modelfilter/dependencies/editor/GetUsedTypes.java
@@ -24,7 +24,8 @@
  * @author Gabriel Barbier

  * 

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470806

  */

 @Deprecated

 public class GetUsedTypes {

diff --git a/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/src/org/eclipse/gmt/modisco/usecase/modelfilter/dependencies/editor/Messages.java b/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/src/org/eclipse/gmt/modisco/usecase/modelfilter/dependencies/editor/Messages.java
index 450eac4..f839b8f 100644
--- a/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/src/org/eclipse/gmt/modisco/usecase/modelfilter/dependencies/editor/Messages.java
+++ b/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/src/org/eclipse/gmt/modisco/usecase/modelfilter/dependencies/editor/Messages.java
@@ -17,7 +17,8 @@
  * @author GBarbier

  * 

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470806

  */

 @Deprecated

 public class Messages extends NLS {

diff --git a/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/src/org/eclipse/gmt/modisco/usecase/modelfilter/dependencies/editor/PrefuseGraphInput.java b/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/src/org/eclipse/gmt/modisco/usecase/modelfilter/dependencies/editor/PrefuseGraphInput.java
index 0674bf1..5a2d831 100644
--- a/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/src/org/eclipse/gmt/modisco/usecase/modelfilter/dependencies/editor/PrefuseGraphInput.java
+++ b/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/src/org/eclipse/gmt/modisco/usecase/modelfilter/dependencies/editor/PrefuseGraphInput.java
@@ -25,7 +25,8 @@
  * @author Gabriel Barbier

  * 

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470806

  */

 @Deprecated

 public class PrefuseGraphInput implements IEditorInput {

diff --git a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/META-INF/MANIFEST.MF
index cf7a5d3..7c7f5f7 100644
--- a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/Activator.java b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/Activator.java
index 2485d72..6a2c5f2 100644
--- a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/Activator.java
+++ b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/Activator.java
@@ -17,7 +17,8 @@
 import org.osgi.framework.BundleContext;
 
 /**
- * @deprecated use matching org.eclipse.modisco.x.y.z component
+ * @deprecated use matching org.eclipse.modisco.x.y.z component,
+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470806
  */
 @Deprecated
 public class Activator extends AbstractUIPlugin {
diff --git a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/actions/DiscoverMethodCallsModelFromAbstractMethodDeclaration.java b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/actions/DiscoverMethodCallsModelFromAbstractMethodDeclaration.java
index 627a465..ea35395 100644
--- a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/actions/DiscoverMethodCallsModelFromAbstractMethodDeclaration.java
+++ b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/actions/DiscoverMethodCallsModelFromAbstractMethodDeclaration.java
@@ -46,7 +46,8 @@
  * @author Gabriel Barbier

  * 

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470806

  */

 @Deprecated

 public class DiscoverMethodCallsModelFromAbstractMethodDeclaration extends AbstractDiscovererImpl

diff --git a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/actions/DiscoverMethodCallsModelFromJavaModel.java b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/actions/DiscoverMethodCallsModelFromJavaModel.java
index 0c212a7..72bd50d 100644
--- a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/actions/DiscoverMethodCallsModelFromJavaModel.java
+++ b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/actions/DiscoverMethodCallsModelFromJavaModel.java
@@ -43,7 +43,8 @@
  * @author Gabriel Barbier

  * 

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470806

  */

 @Deprecated

 public class DiscoverMethodCallsModelFromJavaModel extends AbstractDiscovererImpl implements

diff --git a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/actions/DiscoverMethodCallsModelFromJavaOperation.java b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/actions/DiscoverMethodCallsModelFromJavaOperation.java
index 156ab5f..bc063fe 100644
--- a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/actions/DiscoverMethodCallsModelFromJavaOperation.java
+++ b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/actions/DiscoverMethodCallsModelFromJavaOperation.java
@@ -42,7 +42,8 @@
  * @author Gabriel Barbier

  * 

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470806

  */

 @Deprecated

 public class DiscoverMethodCallsModelFromJavaOperation extends AbstractDiscovererImpl implements

diff --git a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/actions/DiscoverMethodCallsModelFromJavaProject.java b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/actions/DiscoverMethodCallsModelFromJavaProject.java
index 422309c..98b388c 100644
--- a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/actions/DiscoverMethodCallsModelFromJavaProject.java
+++ b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/actions/DiscoverMethodCallsModelFromJavaProject.java
@@ -41,7 +41,8 @@
  * @author Gabriel Barbier

  * 

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component, ,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470806

  */

 @Deprecated

 public class DiscoverMethodCallsModelFromJavaProject extends AbstractDiscovererImpl implements

diff --git a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/actions/Messages.java b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/actions/Messages.java
index 85d8c07..67f3f94 100644
--- a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/actions/Messages.java
+++ b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/actions/Messages.java
@@ -17,7 +17,8 @@
  * @author GBarbier

  * 

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470806

  */

 @Deprecated

 public class Messages extends NLS {

diff --git a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/converter/MethodCallsGraphConverter.java b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/converter/MethodCallsGraphConverter.java
index 5fab9ea..970b27a 100644
--- a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/converter/MethodCallsGraphConverter.java
+++ b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/converter/MethodCallsGraphConverter.java
@@ -55,7 +55,8 @@
  * @author Gabriel Barbier

  * 

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470806

  */

 @Deprecated

 public class MethodCallsGraphConverter {

diff --git a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/converter/MethodCallsJavaBridge.java b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/converter/MethodCallsJavaBridge.java
index 73e9471..bd58a06 100644
--- a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/converter/MethodCallsJavaBridge.java
+++ b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/converter/MethodCallsJavaBridge.java
@@ -21,7 +21,8 @@
  * @author Gabriel Barbier

  * 

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470806

  */

 @Deprecated

 public class MethodCallsJavaBridge {

diff --git a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/converter/PrefuseGraphContainerForJava.java b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/converter/PrefuseGraphContainerForJava.java
index ede579b..bdfaf0f 100644
--- a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/converter/PrefuseGraphContainerForJava.java
+++ b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/converter/PrefuseGraphContainerForJava.java
@@ -26,7 +26,8 @@
 import prefuse.visual.VisualItem;

 

 /**

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470806

  */

 @Deprecated

 public class PrefuseGraphContainerForJava extends PrefuseGraphContainer {

diff --git a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/editor/Messages.java b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/editor/Messages.java
index b43aa1c..c700292 100644
--- a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/editor/Messages.java
+++ b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/editor/Messages.java
@@ -17,7 +17,8 @@
  * @author GBarbier

  * 

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470806

  */

 @Deprecated

 public class Messages extends NLS {

diff --git a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/editor/MethodCallsModelEditor.java b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/editor/MethodCallsModelEditor.java
index dfac805..e81461e 100644
--- a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/editor/MethodCallsModelEditor.java
+++ b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/editor/MethodCallsModelEditor.java
@@ -53,7 +53,8 @@
  * @author Gabriel Barbier

  * 

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470806

  */

 @Deprecated

 public class MethodCallsModelEditor extends EditorPart {

diff --git a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/editor/PrefuseGraphInput.java b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/editor/PrefuseGraphInput.java
index ca44580..e8c9b51 100644
--- a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/editor/PrefuseGraphInput.java
+++ b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/editor/PrefuseGraphInput.java
@@ -24,7 +24,8 @@
  * @author Gabriel Barbier

  * 

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470806

  */

 @Deprecated

 public class PrefuseGraphInput implements IEditorInput {

diff --git a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/model/methodcalls/CallNode.java b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/model/methodcalls/CallNode.java
index d8bfe39..b82de23 100644
--- a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/model/methodcalls/CallNode.java
+++ b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/model/methodcalls/CallNode.java
@@ -46,7 +46,8 @@
  * @model

  * @generated

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470806

  */

 @Deprecated

 public interface CallNode extends EObject {

diff --git a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/model/methodcalls/CallsModel.java b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/model/methodcalls/CallsModel.java
index 7c553f4..53576e7 100644
--- a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/model/methodcalls/CallsModel.java
+++ b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/model/methodcalls/CallsModel.java
@@ -42,7 +42,8 @@
  * @model

  * @generated

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470806

  */

 @Deprecated

 public interface CallsModel extends EObject {

diff --git a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/model/methodcalls/MethodCall.java b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/model/methodcalls/MethodCall.java
index 98bef49..eae28ea 100644
--- a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/model/methodcalls/MethodCall.java
+++ b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/model/methodcalls/MethodCall.java
@@ -45,7 +45,8 @@
  * @model

  * @generated

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470806

  */

 @Deprecated

 public interface MethodCall extends EObject {

diff --git a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/model/methodcalls/MethodcallsFactory.java b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/model/methodcalls/MethodcallsFactory.java
index b96058b..965bf9d 100644
--- a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/model/methodcalls/MethodcallsFactory.java
+++ b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/model/methodcalls/MethodcallsFactory.java
@@ -25,7 +25,8 @@
  * @see org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls.model.methodcalls.MethodcallsPackage

  * @generated

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470806

  */

 @Deprecated

 public interface MethodcallsFactory extends EFactory {

diff --git a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/model/methodcalls/MethodcallsPackage.java b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/model/methodcalls/MethodcallsPackage.java
index e2b9535..f1fa4bf 100644
--- a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/model/methodcalls/MethodcallsPackage.java
+++ b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/model/methodcalls/MethodcallsPackage.java
@@ -36,7 +36,8 @@
  * @model kind="package"

  * @generated

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470806

  */

 @Deprecated

 public interface MethodcallsPackage extends EPackage {

diff --git a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/model/methodcalls/impl/CallNodeImpl.java b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/model/methodcalls/impl/CallNodeImpl.java
index 7873386..2830479 100644
--- a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/model/methodcalls/impl/CallNodeImpl.java
+++ b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/model/methodcalls/impl/CallNodeImpl.java
@@ -56,7 +56,8 @@
  * 

  * @generated

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470806

  */

 @Deprecated

 public class CallNodeImpl extends EObjectImpl implements CallNode {

diff --git a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/model/methodcalls/impl/CallsModelImpl.java b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/model/methodcalls/impl/CallsModelImpl.java
index 4531f42..2dddfa7 100644
--- a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/model/methodcalls/impl/CallsModelImpl.java
+++ b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/model/methodcalls/impl/CallsModelImpl.java
@@ -52,7 +52,8 @@
  * 

  * @generated

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470806

  */

 @Deprecated

 public class CallsModelImpl extends EObjectImpl implements CallsModel {

diff --git a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/model/methodcalls/impl/MethodCallImpl.java b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/model/methodcalls/impl/MethodCallImpl.java
index 2db664a..b2b10b9 100644
--- a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/model/methodcalls/impl/MethodCallImpl.java
+++ b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/model/methodcalls/impl/MethodCallImpl.java
@@ -54,7 +54,8 @@
  * 

  * @generated

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470806

  */

 @Deprecated

 public class MethodCallImpl extends EObjectImpl implements MethodCall {

diff --git a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/model/methodcalls/impl/MethodcallsFactoryImpl.java b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/model/methodcalls/impl/MethodcallsFactoryImpl.java
index 7241df4..fcb9352 100644
--- a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/model/methodcalls/impl/MethodcallsFactoryImpl.java
+++ b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/model/methodcalls/impl/MethodcallsFactoryImpl.java
@@ -32,7 +32,8 @@
  * 

  * @generated

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470806

  */

 @Deprecated

 public class MethodcallsFactoryImpl extends EFactoryImpl implements MethodcallsFactory {

diff --git a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/model/methodcalls/impl/MethodcallsPackageImpl.java b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/model/methodcalls/impl/MethodcallsPackageImpl.java
index fea2223..6494524 100644
--- a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/model/methodcalls/impl/MethodcallsPackageImpl.java
+++ b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/model/methodcalls/impl/MethodcallsPackageImpl.java
@@ -33,7 +33,8 @@
  * 

  * @generated

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470806

  */

 @Deprecated

 public class MethodcallsPackageImpl extends EPackageImpl implements MethodcallsPackage {

diff --git a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/model/methodcalls/util/MethodcallsAdapterFactory.java b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/model/methodcalls/util/MethodcallsAdapterFactory.java
index ac4ea02..3058a69 100644
--- a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/model/methodcalls/util/MethodcallsAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/model/methodcalls/util/MethodcallsAdapterFactory.java
@@ -32,7 +32,8 @@
  * @see org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls.model.methodcalls.MethodcallsPackage

  * @generated

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470806

  */

 @Deprecated

 public class MethodcallsAdapterFactory extends AdapterFactoryImpl {

diff --git a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/model/methodcalls/util/MethodcallsSwitch.java b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/model/methodcalls/util/MethodcallsSwitch.java
index a0b3125..04f2635 100644
--- a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/model/methodcalls/util/MethodcallsSwitch.java
+++ b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/gmt/modisco/usecase/modelfilter/methodcalls/model/methodcalls/util/MethodcallsSwitch.java
@@ -35,7 +35,8 @@
  * @see org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls.model.methodcalls.MethodcallsPackage

  * @generated

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470806

  */

 @Deprecated

 public class MethodcallsSwitch<T> {

diff --git a/org.eclipse.gmt.modisco.usecase.modelfilter/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.usecase.modelfilter/META-INF/MANIFEST.MF
index dc950b1..7a57ffc 100644
--- a/org.eclipse.gmt.modisco.usecase.modelfilter/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.usecase.modelfilter/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0

 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.gmt.modisco.usecase.modelfilter;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-Activator: org.eclipse.gmt.modisco.usecases.modelfilter.ModelFilterActivator

 Require-Bundle: org.eclipse.ui,

  org.eclipse.jdt.core,

diff --git a/org.eclipse.gmt.modisco.usecase.modelfilter/OSGI-INF/l10n/bundle.properties b/org.eclipse.gmt.modisco.usecase.modelfilter/OSGI-INF/l10n/bundle.properties
index eec4628..be9c954 100644
--- a/org.eclipse.gmt.modisco.usecase.modelfilter/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.gmt.modisco.usecase.modelfilter/OSGI-INF/l10n/bundle.properties
@@ -10,6 +10,6 @@
 ###############################################################################

 #Properties file for org.eclipse.gmt.modisco.usecase.modelfilter

 Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = MoDisco Model Filter Plug-in (Incubation)

+Bundle-Name = MoDisco Model Filter Plug-in (Deprecated) (Incubation)

 

-discoverer.name = Create UML model with real types information on associations
\ No newline at end of file
+discoverer.name = Create UML model with real types information on associations (Deprecated)
\ No newline at end of file
diff --git a/org.eclipse.gmt.modisco.usecase.modelfilter/src/org/eclipse/gmt/modisco/usecases/modelfilter/Messages.java b/org.eclipse.gmt.modisco.usecase.modelfilter/src/org/eclipse/gmt/modisco/usecases/modelfilter/Messages.java
index 4b5a1d4..e24d565 100644
--- a/org.eclipse.gmt.modisco.usecase.modelfilter/src/org/eclipse/gmt/modisco/usecases/modelfilter/Messages.java
+++ b/org.eclipse.gmt.modisco.usecase.modelfilter/src/org/eclipse/gmt/modisco/usecases/modelfilter/Messages.java
@@ -14,7 +14,8 @@
 import org.eclipse.osgi.util.NLS;

 

 /**

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470806

  */

 @Deprecated

 public class Messages extends NLS {

diff --git a/org.eclipse.gmt.modisco.usecase.modelfilter/src/org/eclipse/gmt/modisco/usecases/modelfilter/ModelFilterActivator.java b/org.eclipse.gmt.modisco.usecase.modelfilter/src/org/eclipse/gmt/modisco/usecases/modelfilter/ModelFilterActivator.java
index 523c086..44b2062 100644
--- a/org.eclipse.gmt.modisco.usecase.modelfilter/src/org/eclipse/gmt/modisco/usecases/modelfilter/ModelFilterActivator.java
+++ b/org.eclipse.gmt.modisco.usecase.modelfilter/src/org/eclipse/gmt/modisco/usecases/modelfilter/ModelFilterActivator.java
@@ -19,7 +19,8 @@
 /**

  * The activator class controls the plug-in life cycle

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470806

  */

 @Deprecated

 public class ModelFilterActivator extends AbstractUIPlugin {

diff --git a/org.eclipse.gmt.modisco.usecase.modelfilter/src/org/eclipse/gmt/modisco/usecases/modelfilter/actions/DiscoverUmlModelWithRealTypesFromJavaProject.java b/org.eclipse.gmt.modisco.usecase.modelfilter/src/org/eclipse/gmt/modisco/usecases/modelfilter/actions/DiscoverUmlModelWithRealTypesFromJavaProject.java
index 02fb5c7..000c75f 100644
--- a/org.eclipse.gmt.modisco.usecase.modelfilter/src/org/eclipse/gmt/modisco/usecases/modelfilter/actions/DiscoverUmlModelWithRealTypesFromJavaProject.java
+++ b/org.eclipse.gmt.modisco.usecase.modelfilter/src/org/eclipse/gmt/modisco/usecases/modelfilter/actions/DiscoverUmlModelWithRealTypesFromJavaProject.java
@@ -41,7 +41,8 @@
  * @author Gabriel Barbier

  * 

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470806

  */

 @Deprecated

 public class DiscoverUmlModelWithRealTypesFromJavaProject extends AbstractDiscovererImpl {

diff --git a/org.eclipse.gmt.modisco.usecase.modelfilter/src/org/eclipse/gmt/modisco/usecases/modelfilter/converter/BidirectionalUmlConverter.java b/org.eclipse.gmt.modisco.usecase.modelfilter/src/org/eclipse/gmt/modisco/usecases/modelfilter/converter/BidirectionalUmlConverter.java
index c574afb..20d774d 100644
--- a/org.eclipse.gmt.modisco.usecase.modelfilter/src/org/eclipse/gmt/modisco/usecases/modelfilter/converter/BidirectionalUmlConverter.java
+++ b/org.eclipse.gmt.modisco.usecase.modelfilter/src/org/eclipse/gmt/modisco/usecases/modelfilter/converter/BidirectionalUmlConverter.java
@@ -40,7 +40,8 @@
  * @author Gabriel Barbier

  * 

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470806

  */

 @Deprecated

 public class BidirectionalUmlConverter {

diff --git a/org.eclipse.gmt.modisco.usecase.modelfilter/src/org/eclipse/gmt/modisco/usecases/modelfilter/converter/JavaConverter.java b/org.eclipse.gmt.modisco.usecase.modelfilter/src/org/eclipse/gmt/modisco/usecases/modelfilter/converter/JavaConverter.java
index a708562..cb122a3 100644
--- a/org.eclipse.gmt.modisco.usecase.modelfilter/src/org/eclipse/gmt/modisco/usecases/modelfilter/converter/JavaConverter.java
+++ b/org.eclipse.gmt.modisco.usecase.modelfilter/src/org/eclipse/gmt/modisco/usecases/modelfilter/converter/JavaConverter.java
@@ -30,7 +30,8 @@
  * @author Gabriel Barbier

  * 

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470806

  */

 @Deprecated

 public class JavaConverter {

diff --git a/org.eclipse.gmt.modisco.usecase.modelfilter/src/org/eclipse/gmt/modisco/usecases/modelfilter/converter/RealTypesJavaConverter.java b/org.eclipse.gmt.modisco.usecase.modelfilter/src/org/eclipse/gmt/modisco/usecases/modelfilter/converter/RealTypesJavaConverter.java
index 23defbc..f20d5d0 100644
--- a/org.eclipse.gmt.modisco.usecase.modelfilter/src/org/eclipse/gmt/modisco/usecases/modelfilter/converter/RealTypesJavaConverter.java
+++ b/org.eclipse.gmt.modisco.usecase.modelfilter/src/org/eclipse/gmt/modisco/usecases/modelfilter/converter/RealTypesJavaConverter.java
@@ -40,7 +40,8 @@
  * @author Gabriel Barbier

  * 

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470806

  */

 @Deprecated

 public class RealTypesJavaConverter {

diff --git a/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/META-INF/MANIFEST.MF
index a257abf..0f7f5db 100644
--- a/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.gmt.modisco.usecase.modelplex.examples.customization;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.gmt.modisco.usecase.simpletransformationschain/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.usecase.simpletransformationschain/META-INF/MANIFEST.MF
index 132f2cf..3ad5c48 100644
--- a/org.eclipse.gmt.modisco.usecase.simpletransformationschain/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.usecase.simpletransformationschain/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.gmt.modisco.usecase.simpletransformationschain;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.gmt.modisco.usecase.simpletransformationschain.ModelplexKnowledgeDiscoveryFrameworkPlugin
 Require-Bundle: org.eclipse.core.resources,
  org.eclipse.ui,
diff --git a/org.eclipse.gmt.modisco.usecase.simpletransformationschain/OSGI-INF/l10n/bundle.properties b/org.eclipse.gmt.modisco.usecase.simpletransformationschain/OSGI-INF/l10n/bundle.properties
index 03c82fe..02d5be4 100644
--- a/org.eclipse.gmt.modisco.usecase.simpletransformationschain/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.gmt.modisco.usecase.simpletransformationschain/OSGI-INF/l10n/bundle.properties
@@ -9,9 +9,9 @@
 #    Nicolas Bros (Mia-Software) - initial API and implementation

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

 #Properties file for org.eclipse.gmt.modisco.usecase.simpletransformationschain

-discoverer.name = Discover UML model from Java project

-discoverer.name.0 = Discover bidirectional associations from UML model

-discoverer.name.1 = Discover UML model with bidirectional associations from Java project

-discoverer.name.2 = Wizard to customize Modelplex Knowledge Discovery

+discoverer.name = Discover UML model from Java project (Deprecated)

+discoverer.name.0 = Discover bidirectional associations from UML model (Deprecated)

+discoverer.name.1 = Discover UML model with bidirectional associations from Java project (Deprecated)

+discoverer.name.2 = Wizard to customize Modelplex Knowledge Discovery (Deprecated)

 Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = MoDisco Simple Transformations Chain Plug-in (Incubation)
\ No newline at end of file
+Bundle-Name = MoDisco Simple Transformations Chain Plug-in (Deprecated) (Incubation)
\ No newline at end of file
diff --git a/org.eclipse.gmt.modisco.usecase.simpletransformationschain/src/org/eclipse/gmt/modisco/usecase/simpletransformationschain/KnowledgeDiscoveryInterface.java b/org.eclipse.gmt.modisco.usecase.simpletransformationschain/src/org/eclipse/gmt/modisco/usecase/simpletransformationschain/KnowledgeDiscoveryInterface.java
index 4b5f32f..b67e52b 100644
--- a/org.eclipse.gmt.modisco.usecase.simpletransformationschain/src/org/eclipse/gmt/modisco/usecase/simpletransformationschain/KnowledgeDiscoveryInterface.java
+++ b/org.eclipse.gmt.modisco.usecase.simpletransformationschain/src/org/eclipse/gmt/modisco/usecase/simpletransformationschain/KnowledgeDiscoveryInterface.java
@@ -22,7 +22,8 @@
  * @author Gabriel Barbier

  * 

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component,

+ *  cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=474680

  */

 @Deprecated

 public interface KnowledgeDiscoveryInterface {

diff --git a/org.eclipse.gmt.modisco.usecase.simpletransformationschain/src/org/eclipse/gmt/modisco/usecase/simpletransformationschain/Messages.java b/org.eclipse.gmt.modisco.usecase.simpletransformationschain/src/org/eclipse/gmt/modisco/usecase/simpletransformationschain/Messages.java
index a480a7c..62c9d41 100644
--- a/org.eclipse.gmt.modisco.usecase.simpletransformationschain/src/org/eclipse/gmt/modisco/usecase/simpletransformationschain/Messages.java
+++ b/org.eclipse.gmt.modisco.usecase.simpletransformationschain/src/org/eclipse/gmt/modisco/usecase/simpletransformationschain/Messages.java
@@ -12,6 +12,11 @@
 

 import org.eclipse.osgi.util.NLS;

 

+/**

+ * @deprecated Will be removed,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470701

+ */

+@Deprecated

 public class Messages extends NLS {

 	private static final String BUNDLE_NAME = "org.eclipse.gmt.modisco.usecase.simpletransformationschain.messages"; //$NON-NLS-1$

 	public static String AbstractKnowledgeDiscoveryWizard_wizardTitle;

diff --git a/org.eclipse.gmt.modisco.usecase.simpletransformationschain/src/org/eclipse/gmt/modisco/usecase/simpletransformationschain/ModelplexKnowledgeDiscoveryFramework.java b/org.eclipse.gmt.modisco.usecase.simpletransformationschain/src/org/eclipse/gmt/modisco/usecase/simpletransformationschain/ModelplexKnowledgeDiscoveryFramework.java
index 3738564..1e903ce 100644
--- a/org.eclipse.gmt.modisco.usecase.simpletransformationschain/src/org/eclipse/gmt/modisco/usecase/simpletransformationschain/ModelplexKnowledgeDiscoveryFramework.java
+++ b/org.eclipse.gmt.modisco.usecase.simpletransformationschain/src/org/eclipse/gmt/modisco/usecase/simpletransformationschain/ModelplexKnowledgeDiscoveryFramework.java
@@ -38,7 +38,8 @@
 import org.eclipse.m2m.atl.core.ATLCoreException;

 

 /**

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component,

+ *  cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=474680

  */

 @Deprecated

 public class ModelplexKnowledgeDiscoveryFramework implements KnowledgeDiscoveryInterface {

diff --git a/org.eclipse.gmt.modisco.usecase.simpletransformationschain/src/org/eclipse/gmt/modisco/usecase/simpletransformationschain/ModelplexKnowledgeDiscoveryFrameworkPlugin.java b/org.eclipse.gmt.modisco.usecase.simpletransformationschain/src/org/eclipse/gmt/modisco/usecase/simpletransformationschain/ModelplexKnowledgeDiscoveryFrameworkPlugin.java
index bef7c26..8cddfad 100644
--- a/org.eclipse.gmt.modisco.usecase.simpletransformationschain/src/org/eclipse/gmt/modisco/usecase/simpletransformationschain/ModelplexKnowledgeDiscoveryFrameworkPlugin.java
+++ b/org.eclipse.gmt.modisco.usecase.simpletransformationschain/src/org/eclipse/gmt/modisco/usecase/simpletransformationschain/ModelplexKnowledgeDiscoveryFrameworkPlugin.java
@@ -22,7 +22,8 @@
 /**

  * The activator class controls the plug-in life cycle

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component,

+ *  cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=474680

  */

 @Deprecated

 public class ModelplexKnowledgeDiscoveryFrameworkPlugin extends AbstractUIPlugin {

diff --git a/org.eclipse.gmt.modisco.usecase.simpletransformationschain/src/org/eclipse/gmt/modisco/usecase/simpletransformationschain/PreferencesKeys.java b/org.eclipse.gmt.modisco.usecase.simpletransformationschain/src/org/eclipse/gmt/modisco/usecase/simpletransformationschain/PreferencesKeys.java
index 962472e..f16f28b 100644
--- a/org.eclipse.gmt.modisco.usecase.simpletransformationschain/src/org/eclipse/gmt/modisco/usecase/simpletransformationschain/PreferencesKeys.java
+++ b/org.eclipse.gmt.modisco.usecase.simpletransformationschain/src/org/eclipse/gmt/modisco/usecase/simpletransformationschain/PreferencesKeys.java
@@ -18,7 +18,8 @@
  * @author Gabriel Barbier

  * 

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component,

+ *  cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=474680

  */

 @Deprecated

 public interface PreferencesKeys {

diff --git a/org.eclipse.gmt.modisco.usecase.simpletransformationschain/src/org/eclipse/gmt/modisco/usecase/simpletransformationschain/actions/DiscoverBidirectionalAssociationsInUmlModel.java b/org.eclipse.gmt.modisco.usecase.simpletransformationschain/src/org/eclipse/gmt/modisco/usecase/simpletransformationschain/actions/DiscoverBidirectionalAssociationsInUmlModel.java
index b353cbe..5727cff 100644
--- a/org.eclipse.gmt.modisco.usecase.simpletransformationschain/src/org/eclipse/gmt/modisco/usecase/simpletransformationschain/actions/DiscoverBidirectionalAssociationsInUmlModel.java
+++ b/org.eclipse.gmt.modisco.usecase.simpletransformationschain/src/org/eclipse/gmt/modisco/usecase/simpletransformationschain/actions/DiscoverBidirectionalAssociationsInUmlModel.java
@@ -41,7 +41,8 @@
  * @author Gabriel Barbier

  * 

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component,

+ *  cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=474680

  */

 @Deprecated

 public class DiscoverBidirectionalAssociationsInUmlModel implements Discoverer {

diff --git a/org.eclipse.gmt.modisco.usecase.simpletransformationschain/src/org/eclipse/gmt/modisco/usecase/simpletransformationschain/actions/DiscoverUmlModelFromJavaProject.java b/org.eclipse.gmt.modisco.usecase.simpletransformationschain/src/org/eclipse/gmt/modisco/usecase/simpletransformationschain/actions/DiscoverUmlModelFromJavaProject.java
index cbd221f..67afef5 100644
--- a/org.eclipse.gmt.modisco.usecase.simpletransformationschain/src/org/eclipse/gmt/modisco/usecase/simpletransformationschain/actions/DiscoverUmlModelFromJavaProject.java
+++ b/org.eclipse.gmt.modisco.usecase.simpletransformationschain/src/org/eclipse/gmt/modisco/usecase/simpletransformationschain/actions/DiscoverUmlModelFromJavaProject.java
@@ -51,7 +51,8 @@
  * @author Gabriel Barbier

  * 

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component,

+ *  cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=474680

  */

 @Deprecated

 public class DiscoverUmlModelFromJavaProject implements Discoverer {

diff --git a/org.eclipse.gmt.modisco.usecase.simpletransformationschain/src/org/eclipse/gmt/modisco/usecase/simpletransformationschain/actions/DiscoverUmlModelWithBidirectionalAssociationsFromJavaProject.java b/org.eclipse.gmt.modisco.usecase.simpletransformationschain/src/org/eclipse/gmt/modisco/usecase/simpletransformationschain/actions/DiscoverUmlModelWithBidirectionalAssociationsFromJavaProject.java
index c9e0c3b..a654f0a 100644
--- a/org.eclipse.gmt.modisco.usecase.simpletransformationschain/src/org/eclipse/gmt/modisco/usecase/simpletransformationschain/actions/DiscoverUmlModelWithBidirectionalAssociationsFromJavaProject.java
+++ b/org.eclipse.gmt.modisco.usecase.simpletransformationschain/src/org/eclipse/gmt/modisco/usecase/simpletransformationschain/actions/DiscoverUmlModelWithBidirectionalAssociationsFromJavaProject.java
@@ -51,7 +51,8 @@
  * @author Gabriel Barbier

  * 

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component,

+ *  cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=474680

  */

 @Deprecated

 public class DiscoverUmlModelWithBidirectionalAssociationsFromJavaProject implements Discoverer {

diff --git a/org.eclipse.gmt.modisco.usecase.simpletransformationschain/src/org/eclipse/gmt/modisco/usecase/simpletransformationschain/actions/DiscoveryCustomizationToUmlModelFromJavaProject.java b/org.eclipse.gmt.modisco.usecase.simpletransformationschain/src/org/eclipse/gmt/modisco/usecase/simpletransformationschain/actions/DiscoveryCustomizationToUmlModelFromJavaProject.java
index 8f2471e..f61ade7 100644
--- a/org.eclipse.gmt.modisco.usecase.simpletransformationschain/src/org/eclipse/gmt/modisco/usecase/simpletransformationschain/actions/DiscoveryCustomizationToUmlModelFromJavaProject.java
+++ b/org.eclipse.gmt.modisco.usecase.simpletransformationschain/src/org/eclipse/gmt/modisco/usecase/simpletransformationschain/actions/DiscoveryCustomizationToUmlModelFromJavaProject.java
@@ -39,7 +39,8 @@
  * @author Gabriel Barbier

  * 

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component,

+ *  cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=474680

  */

 @Deprecated

 public class DiscoveryCustomizationToUmlModelFromJavaProject extends AbstractDiscovererImpl

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.workflow.mwe/META-INF/MANIFEST.MF
index 174450d..beb4e57 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.workflow.mwe/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.gmt.modisco.workflow.mwe;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-ClassPath: .
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.gmt.modisco.workflow.mwe/plugin.properties b/org.eclipse.gmt.modisco.workflow.mwe/plugin.properties
index 3d0817a..c8e24d7 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/plugin.properties
+++ b/org.eclipse.gmt.modisco.workflow.mwe/plugin.properties
@@ -9,7 +9,7 @@
 #    Gabriel Barbier (Mia-Software) - initial API and implementation

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

 # NLS_MESSAGEFORMAT_VAR

-pluginName=MoDisco Engine driver for MWE (Incubation)

+pluginName=MoDisco Engine driver for MWE (Deprecated) (Incubation)

 providerName=Eclipse Modeling Project

 

 workflowCore.name = MWE
\ No newline at end of file
diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/Activator.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/Activator.java
index 5a0e224..db3c029 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/Activator.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/Activator.java
@@ -14,6 +14,10 @@
 import org.eclipse.ui.plugin.AbstractUIPlugin;

 import org.osgi.framework.BundleContext;

 

+/**

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

+ */

 @Deprecated
 public class Activator extends AbstractUIPlugin {

 

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/Constants.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/Constants.java
index ebab731..61b8874 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/Constants.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/Constants.java
@@ -10,6 +10,10 @@
  */

 package org.eclipse.gmt.modisco.workflow.mwe;

 

+/**

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

+*/

 @Deprecated

 public final class Constants {

 

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/Messages.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/Messages.java
index d1c1252..52698b2 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/Messages.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/Messages.java
@@ -14,7 +14,8 @@
 

 /**

  * @author gdupe

- *

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class Messages extends NLS {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/impl/WorkflowExecutionImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/impl/WorkflowExecutionImpl.java
index 49de021..2b728f2 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/impl/WorkflowExecutionImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/impl/WorkflowExecutionImpl.java
@@ -25,6 +25,10 @@
 import org.eclipse.gmt.modisco.workflow.modiscoworkflow.Element;

 import org.eclipse.gmt.modisco.workflow.mwe.Activator;

 

+/**

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

+ */

 @Deprecated
 public class WorkflowExecutionImpl implements WorkflowExecution {

 

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/impl/WorkflowModelImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/impl/WorkflowModelImpl.java
index e92b428..d1fe994 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/impl/WorkflowModelImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/impl/WorkflowModelImpl.java
@@ -69,6 +69,10 @@
 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.impl.RuntimeFactoryImpl;

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.impl.WorkflowParameterMapImpl;

 

+/**

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

+ */

 @Deprecated
 public class WorkflowModelImpl extends WorkflowImpl implements WorkflowModel {

 	

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/impl/WorkflowModelNotifier.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/impl/WorkflowModelNotifier.java
index e0416be..acd1c0b 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/impl/WorkflowModelNotifier.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/impl/WorkflowModelNotifier.java
@@ -17,7 +17,10 @@
 import org.eclipse.gmt.modisco.workflow.WorkflowModelEventsSubscribe;

 import org.eclipse.gmt.modisco.workflow.modiscoworkflow.Element;

 

-

+/**

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

+ */

 @Deprecated
 public class WorkflowModelNotifier implements WorkflowModelEvents, WorkflowModelEventsSubscribe {

 

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/Direction.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/Direction.java
index 767cada..a42b9db 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/Direction.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/Direction.java
@@ -27,6 +27,8 @@
  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.WorkflowPackage#getDirection()

  * @model

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public enum Direction implements Enumerator {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/IWorkflowVisitor.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/IWorkflowVisitor.java
index 9bfe59f..fc53fa9 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/IWorkflowVisitor.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/IWorkflowVisitor.java
@@ -24,6 +24,8 @@
  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.WorkflowPackage#getIWorkflowVisitor()

  * @model interface="true" abstract="true"

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public interface IWorkflowVisitor extends EObject {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/Workflow.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/Workflow.java
index f7ed2a1..aba1c34 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/Workflow.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/Workflow.java
@@ -35,6 +35,8 @@
  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.WorkflowPackage#getWorkflow()

  * @model

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public interface Workflow extends EObject {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/WorkflowComponent.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/WorkflowComponent.java
index 7914a8b..8c1a7f5 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/WorkflowComponent.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/WorkflowComponent.java
@@ -40,6 +40,8 @@
  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.WorkflowPackage#getWorkflowComponent()

  * @model abstract="true"

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public interface WorkflowComponent extends EObject {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/WorkflowComponentMinimalist.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/WorkflowComponentMinimalist.java
index 6af2574..cd3cfc3 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/WorkflowComponentMinimalist.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/WorkflowComponentMinimalist.java
@@ -23,6 +23,8 @@
  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.WorkflowPackage#getWorkflowComponentMinimalist()

  * @model

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public interface WorkflowComponentMinimalist extends WorkflowComponent {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/WorkflowComponentProxy.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/WorkflowComponentProxy.java
index 0db1f60..84959d8 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/WorkflowComponentProxy.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/WorkflowComponentProxy.java
@@ -29,6 +29,8 @@
  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.WorkflowPackage#getWorkflowComponentProxy()

  * @model

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public interface WorkflowComponentProxy extends WorkflowComponent {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/WorkflowCompositeComponent.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/WorkflowCompositeComponent.java
index a5f1dc6..3d92763 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/WorkflowCompositeComponent.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/WorkflowCompositeComponent.java
@@ -41,6 +41,8 @@
  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.WorkflowPackage#getWorkflowCompositeComponent()

  * @model

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public interface WorkflowCompositeComponent extends WorkflowComponent {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/WorkflowFactory.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/WorkflowFactory.java
index 5ec02fd..2fedd02 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/WorkflowFactory.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/WorkflowFactory.java
@@ -22,6 +22,8 @@
  * <!-- end-user-doc -->

  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.WorkflowPackage

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public interface WorkflowFactory extends EFactory {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/WorkflowPackage.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/WorkflowPackage.java
index 7b0e2d4..afe9047 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/WorkflowPackage.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/WorkflowPackage.java
@@ -33,6 +33,8 @@
  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.WorkflowFactory

  * @model kind="package"

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public interface WorkflowPackage extends EPackage {

@@ -1012,7 +1014,10 @@
 	 * </ul>

 	 * <!-- end-user-doc -->

 	 * @generated

+	 * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+	 *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

 	 */

+	@Deprecated

 	interface Literals {

 		/**

 		 * The meta object literal for the '{@link org.eclipse.gmt.modisco.workflow.mwe.workflow.impl.WorkflowImpl <em>Workflow</em>}' class.

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/WorkflowParameter.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/WorkflowParameter.java
index 98f3407..9cb04ea 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/WorkflowParameter.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/WorkflowParameter.java
@@ -38,6 +38,8 @@
  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.WorkflowPackage#getWorkflowParameter()

  * @model

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public interface WorkflowParameter extends EObject {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/WorkflowParameterConnection.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/WorkflowParameterConnection.java
index 08c86b5..0c54ec1 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/WorkflowParameterConnection.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/WorkflowParameterConnection.java
@@ -33,6 +33,8 @@
  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.WorkflowPackage#getWorkflowParameterConnection()

  * @model

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public interface WorkflowParameterConnection extends EObject {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/WorkflowParameterSimpleValueStrategy.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/WorkflowParameterSimpleValueStrategy.java
index 5e9bd7b..e929039 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/WorkflowParameterSimpleValueStrategy.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/WorkflowParameterSimpleValueStrategy.java
@@ -24,6 +24,8 @@
  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.WorkflowPackage#getWorkflowParameterSimpleValueStrategy()

  * @model

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public interface WorkflowParameterSimpleValueStrategy extends WorkflowParameterValueStrategy {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/WorkflowParameterValueStrategy.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/WorkflowParameterValueStrategy.java
index 5b53a4a..e3c8d7d 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/WorkflowParameterValueStrategy.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/WorkflowParameterValueStrategy.java
@@ -26,6 +26,8 @@
  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.WorkflowPackage#getWorkflowParameterValueStrategy()

  * @model

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public interface WorkflowParameterValueStrategy extends EObject {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/WorkflowUnitOfWork.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/WorkflowUnitOfWork.java
index 95c5f99..48d8e3b 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/WorkflowUnitOfWork.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/WorkflowUnitOfWork.java
@@ -34,6 +34,8 @@
  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.WorkflowPackage#getWorkflowUnitOfWork()

  * @model

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public interface WorkflowUnitOfWork extends WorkflowComponent {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/impl/WorkflowComponentImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/impl/WorkflowComponentImpl.java
index a84f6cb..daba661 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/impl/WorkflowComponentImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/impl/WorkflowComponentImpl.java
@@ -48,7 +48,10 @@
  * </p>

  *

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

+@Deprecated

 public abstract class WorkflowComponentImpl extends EObjectImpl implements WorkflowComponent {

 	/**

 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/impl/WorkflowComponentMinimalistImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/impl/WorkflowComponentMinimalistImpl.java
index 6468dbf..eb9f54c 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/impl/WorkflowComponentMinimalistImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/impl/WorkflowComponentMinimalistImpl.java
@@ -26,6 +26,8 @@
  * </p>

  *

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class WorkflowComponentMinimalistImpl extends WorkflowComponentImpl implements WorkflowComponentMinimalist {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/impl/WorkflowComponentProxyImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/impl/WorkflowComponentProxyImpl.java
index df8a889..146003a 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/impl/WorkflowComponentProxyImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/impl/WorkflowComponentProxyImpl.java
@@ -36,6 +36,8 @@
  * </p>

  *

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class WorkflowComponentProxyImpl extends WorkflowComponentImpl implements WorkflowComponentProxy {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/impl/WorkflowCompositeComponentImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/impl/WorkflowCompositeComponentImpl.java
index d3d0b17..900e1e8 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/impl/WorkflowCompositeComponentImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/impl/WorkflowCompositeComponentImpl.java
@@ -55,6 +55,8 @@
  * </p>

  *

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class WorkflowCompositeComponentImpl extends WorkflowComponentImpl implements WorkflowCompositeComponent {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/impl/WorkflowFactoryImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/impl/WorkflowFactoryImpl.java
index 7741028..d8b8d75 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/impl/WorkflowFactoryImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/impl/WorkflowFactoryImpl.java
@@ -29,6 +29,8 @@
  * An implementation of the model <b>Factory</b>.

  * <!-- end-user-doc -->

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class WorkflowFactoryImpl extends EFactoryImpl implements WorkflowFactory {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/impl/WorkflowImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/impl/WorkflowImpl.java
index ded89db..ce50187 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/impl/WorkflowImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/impl/WorkflowImpl.java
@@ -46,6 +46,8 @@
  * </p>

  *

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class WorkflowImpl extends EObjectImpl implements Workflow {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/impl/WorkflowPackageImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/impl/WorkflowPackageImpl.java
index 4d7c84b..f8d6b73 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/impl/WorkflowPackageImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/impl/WorkflowPackageImpl.java
@@ -55,6 +55,8 @@
  * An implementation of the model <b>Package</b>.

  * <!-- end-user-doc -->

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class WorkflowPackageImpl extends EPackageImpl implements WorkflowPackage {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/impl/WorkflowParameterConnectionImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/impl/WorkflowParameterConnectionImpl.java
index 675b4d8..36c30e5 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/impl/WorkflowParameterConnectionImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/impl/WorkflowParameterConnectionImpl.java
@@ -46,6 +46,8 @@
  * </p>

  *

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class WorkflowParameterConnectionImpl extends EObjectImpl implements WorkflowParameterConnection {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/impl/WorkflowParameterImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/impl/WorkflowParameterImpl.java
index 1ab1cc7..831c786 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/impl/WorkflowParameterImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/impl/WorkflowParameterImpl.java
@@ -48,6 +48,8 @@
  * </p>

  *

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class WorkflowParameterImpl extends EObjectImpl implements WorkflowParameter {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/impl/WorkflowParameterSimpleValueStrategyImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/impl/WorkflowParameterSimpleValueStrategyImpl.java
index 6450984..1b4631b 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/impl/WorkflowParameterSimpleValueStrategyImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/impl/WorkflowParameterSimpleValueStrategyImpl.java
@@ -26,6 +26,8 @@
  * </p>

  *

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class WorkflowParameterSimpleValueStrategyImpl extends WorkflowParameterValueStrategyImpl implements WorkflowParameterSimpleValueStrategy {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/impl/WorkflowParameterValueStrategyImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/impl/WorkflowParameterValueStrategyImpl.java
index 9a91b9e..f42f869 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/impl/WorkflowParameterValueStrategyImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/impl/WorkflowParameterValueStrategyImpl.java
@@ -31,6 +31,8 @@
  * </p>

  *

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class WorkflowParameterValueStrategyImpl extends EObjectImpl implements WorkflowParameterValueStrategy {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/impl/WorkflowUnitOfWorkImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/impl/WorkflowUnitOfWorkImpl.java
index b05076e..4a83718 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/impl/WorkflowUnitOfWorkImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/impl/WorkflowUnitOfWorkImpl.java
@@ -41,6 +41,8 @@
  * </p>

  *

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class WorkflowUnitOfWorkImpl extends WorkflowComponentImpl implements WorkflowUnitOfWork {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/OrchestrationFactory.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/OrchestrationFactory.java
index 7c734e6..950a05d 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/OrchestrationFactory.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/OrchestrationFactory.java
@@ -22,6 +22,8 @@
  * <!-- end-user-doc -->

  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.orchestration.OrchestrationPackage

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public interface OrchestrationFactory extends EFactory {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/OrchestrationPackage.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/OrchestrationPackage.java
index 8311ff7..f83e4ba 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/OrchestrationPackage.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/OrchestrationPackage.java
@@ -31,6 +31,8 @@
  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.orchestration.OrchestrationFactory

  * @model kind="package"

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public interface OrchestrationPackage extends EPackage {

@@ -310,7 +312,10 @@
 	 * </ul>

 	 * <!-- end-user-doc -->

 	 * @generated

+	 * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+	 *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

 	 */

+	@Deprecated

 	interface Literals {

 		/**

 		 * The meta object literal for the '{@link org.eclipse.gmt.modisco.workflow.mwe.workflow.orchestration.impl.WorkflowSerialOrchestrationStrategyImpl <em>Workflow Serial Orchestration Strategy</em>}' class.

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/WorkflowComponentOrchestrationStrategy.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/WorkflowComponentOrchestrationStrategy.java
index 25ccbd9..2e8b1ba 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/WorkflowComponentOrchestrationStrategy.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/WorkflowComponentOrchestrationStrategy.java
@@ -28,6 +28,8 @@
  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.orchestration.OrchestrationPackage#getWorkflowComponentOrchestrationStrategy()

  * @model

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public interface WorkflowComponentOrchestrationStrategy extends EObject {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/WorkflowCompositeOrchestrationStrategy.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/WorkflowCompositeOrchestrationStrategy.java
index 10925c2..513a833 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/WorkflowCompositeOrchestrationStrategy.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/WorkflowCompositeOrchestrationStrategy.java
@@ -28,6 +28,8 @@
  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.orchestration.OrchestrationPackage#getWorkflowCompositeOrchestrationStrategy()

  * @model abstract="true"

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public interface WorkflowCompositeOrchestrationStrategy extends EObject {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/WorkflowConditionalComponentOrchestrationStrategy.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/WorkflowConditionalComponentOrchestrationStrategy.java
index b379e6e..188ca67 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/WorkflowConditionalComponentOrchestrationStrategy.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/WorkflowConditionalComponentOrchestrationStrategy.java
@@ -34,6 +34,8 @@
  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.orchestration.OrchestrationPackage#getWorkflowConditionalComponentOrchestrationStrategy()

  * @model

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public interface WorkflowConditionalComponentOrchestrationStrategy extends WorkflowComponentOrchestrationStrategy {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/WorkflowExecutionPredicate.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/WorkflowExecutionPredicate.java
index 2367f25..d92dda0 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/WorkflowExecutionPredicate.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/WorkflowExecutionPredicate.java
@@ -28,6 +28,8 @@
  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.orchestration.OrchestrationPackage#getWorkflowExecutionPredicate()

  * @model abstract="true"

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public interface WorkflowExecutionPredicate extends EObject {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/WorkflowParallelOrchestrationStrategy.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/WorkflowParallelOrchestrationStrategy.java
index 7443edc..d979e79 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/WorkflowParallelOrchestrationStrategy.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/WorkflowParallelOrchestrationStrategy.java
@@ -26,6 +26,8 @@
  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.orchestration.OrchestrationPackage#getWorkflowParallelOrchestrationStrategy()

  * @model

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public interface WorkflowParallelOrchestrationStrategy extends WorkflowCompositeOrchestrationStrategy {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/WorkflowRerunPredicate.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/WorkflowRerunPredicate.java
index 51818df..bef8413 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/WorkflowRerunPredicate.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/WorkflowRerunPredicate.java
@@ -26,6 +26,8 @@
  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.orchestration.OrchestrationPackage#getWorkflowRerunPredicate()

  * @model

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public interface WorkflowRerunPredicate extends WorkflowExecutionPredicate {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/WorkflowSerialOrchestrationStrategy.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/WorkflowSerialOrchestrationStrategy.java
index 78adf69..6a58d7f 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/WorkflowSerialOrchestrationStrategy.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/WorkflowSerialOrchestrationStrategy.java
@@ -26,6 +26,8 @@
  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.orchestration.OrchestrationPackage#getWorkflowSerialOrchestrationStrategy()

  * @model

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public interface WorkflowSerialOrchestrationStrategy extends WorkflowCompositeOrchestrationStrategy {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/impl/OrchestrationFactoryImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/impl/OrchestrationFactoryImpl.java
index e12df14..bb6918f 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/impl/OrchestrationFactoryImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/impl/OrchestrationFactoryImpl.java
@@ -28,6 +28,8 @@
  * An implementation of the model <b>Factory</b>.

  * <!-- end-user-doc -->

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class OrchestrationFactoryImpl extends EFactoryImpl implements OrchestrationFactory {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/impl/OrchestrationPackageImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/impl/OrchestrationPackageImpl.java
index 9ff78c2..fe3a1bb 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/impl/OrchestrationPackageImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/impl/OrchestrationPackageImpl.java
@@ -48,6 +48,8 @@
  * An implementation of the model <b>Package</b>.

  * <!-- end-user-doc -->

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class OrchestrationPackageImpl extends EPackageImpl implements OrchestrationPackage {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/impl/WorkflowComponentOrchestrationStrategyImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/impl/WorkflowComponentOrchestrationStrategyImpl.java
index e65602b..c200074 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/impl/WorkflowComponentOrchestrationStrategyImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/impl/WorkflowComponentOrchestrationStrategyImpl.java
@@ -32,6 +32,8 @@
  * </p>

  *

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class WorkflowComponentOrchestrationStrategyImpl extends EObjectImpl implements WorkflowComponentOrchestrationStrategy {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/impl/WorkflowCompositeOrchestrationStrategyImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/impl/WorkflowCompositeOrchestrationStrategyImpl.java
index 3f54f99..424a4af 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/impl/WorkflowCompositeOrchestrationStrategyImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/impl/WorkflowCompositeOrchestrationStrategyImpl.java
@@ -32,7 +32,10 @@
  * </p>

  *

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

+@Deprecated

 public abstract class WorkflowCompositeOrchestrationStrategyImpl extends EObjectImpl implements WorkflowCompositeOrchestrationStrategy {

 	/**

 	 * <!-- begin-user-doc -->

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/impl/WorkflowConditionalComponentOrchestrationStrategyImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/impl/WorkflowConditionalComponentOrchestrationStrategyImpl.java
index 20222a4..a821629 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/impl/WorkflowConditionalComponentOrchestrationStrategyImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/impl/WorkflowConditionalComponentOrchestrationStrategyImpl.java
@@ -41,6 +41,8 @@
  * </p>

  *

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class WorkflowConditionalComponentOrchestrationStrategyImpl extends WorkflowComponentOrchestrationStrategyImpl implements WorkflowConditionalComponentOrchestrationStrategy {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/impl/WorkflowExecutionPredicateImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/impl/WorkflowExecutionPredicateImpl.java
index ba39886..ce18168 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/impl/WorkflowExecutionPredicateImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/impl/WorkflowExecutionPredicateImpl.java
@@ -32,7 +32,10 @@
  * </p>

  *

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

+@Deprecated

 public abstract class WorkflowExecutionPredicateImpl extends EObjectImpl implements WorkflowExecutionPredicate {

 	/**

 	 * <!-- begin-user-doc -->

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/impl/WorkflowParallelOrchestrationStrategyImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/impl/WorkflowParallelOrchestrationStrategyImpl.java
index 7bc07fd..0524f97 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/impl/WorkflowParallelOrchestrationStrategyImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/impl/WorkflowParallelOrchestrationStrategyImpl.java
@@ -26,6 +26,8 @@
  * </p>

  *

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class WorkflowParallelOrchestrationStrategyImpl extends WorkflowCompositeOrchestrationStrategyImpl implements WorkflowParallelOrchestrationStrategy {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/impl/WorkflowRerunPredicateImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/impl/WorkflowRerunPredicateImpl.java
index 3a09fd9..f1545ca 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/impl/WorkflowRerunPredicateImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/impl/WorkflowRerunPredicateImpl.java
@@ -26,6 +26,8 @@
  * </p>

  *

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class WorkflowRerunPredicateImpl extends WorkflowExecutionPredicateImpl implements WorkflowRerunPredicate {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/impl/WorkflowSerialOrchestrationStrategyImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/impl/WorkflowSerialOrchestrationStrategyImpl.java
index 9ef98ae..94ae178 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/impl/WorkflowSerialOrchestrationStrategyImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/impl/WorkflowSerialOrchestrationStrategyImpl.java
@@ -26,6 +26,8 @@
  * </p>

  *

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class WorkflowSerialOrchestrationStrategyImpl extends WorkflowCompositeOrchestrationStrategyImpl implements WorkflowSerialOrchestrationStrategy {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/util/OrchestrationAdapterFactory.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/util/OrchestrationAdapterFactory.java
index 078b260..3c84394 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/util/OrchestrationAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/util/OrchestrationAdapterFactory.java
@@ -29,6 +29,8 @@
  * <!-- end-user-doc -->

  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.orchestration.OrchestrationPackage

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class OrchestrationAdapterFactory extends AdapterFactoryImpl {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/util/OrchestrationResourceFactoryImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/util/OrchestrationResourceFactoryImpl.java
index ed14127..e2e1015 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/util/OrchestrationResourceFactoryImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/util/OrchestrationResourceFactoryImpl.java
@@ -27,6 +27,8 @@
  * <!-- end-user-doc -->

  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.orchestration.util.OrchestrationResourceImpl

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class OrchestrationResourceFactoryImpl extends ResourceFactoryImpl {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/util/OrchestrationResourceImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/util/OrchestrationResourceImpl.java
index 4ccd944..0c87789 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/util/OrchestrationResourceImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/util/OrchestrationResourceImpl.java
@@ -23,6 +23,8 @@
  * <!-- end-user-doc -->

  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.orchestration.util.OrchestrationResourceFactoryImpl

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class OrchestrationResourceImpl extends XMLResourceImpl {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/util/OrchestrationSwitch.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/util/OrchestrationSwitch.java
index f02eaa1..5cd7a0a 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/util/OrchestrationSwitch.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/util/OrchestrationSwitch.java
@@ -32,6 +32,8 @@
  * <!-- end-user-doc -->

  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.orchestration.OrchestrationPackage

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class OrchestrationSwitch<T> {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/util/OrchestrationXMLProcessor.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/util/OrchestrationXMLProcessor.java
index f03f2c7..29009cf 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/util/OrchestrationXMLProcessor.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/orchestration/util/OrchestrationXMLProcessor.java
@@ -28,6 +28,8 @@
  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class OrchestrationXMLProcessor extends XMLProcessor {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/RuntimeFactory.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/RuntimeFactory.java
index 855f9f2..165d6bb 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/RuntimeFactory.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/RuntimeFactory.java
@@ -22,6 +22,8 @@
  * <!-- end-user-doc -->

  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.RuntimePackage

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public interface RuntimeFactory extends EFactory {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/RuntimePackage.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/RuntimePackage.java
index e86cc0f..efe535d 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/RuntimePackage.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/RuntimePackage.java
@@ -36,6 +36,8 @@
  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.RuntimeFactory

  * @model kind="package"

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public interface RuntimePackage extends EPackage {

@@ -1104,7 +1106,10 @@
 	 * </ul>

 	 * <!-- end-user-doc -->

 	 * @generated

+	 * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+	 *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

 	 */

+	@Deprecated

 	interface Literals {

 		/**

 		 * The meta object literal for the '{@link org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.impl.WorkflowContextImpl <em>Workflow Context</em>}' class.

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/WorkflowContext.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/WorkflowContext.java
index 249ed5f..759fe3d 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/WorkflowContext.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/WorkflowContext.java
@@ -43,6 +43,8 @@
  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.RuntimePackage#getWorkflowContext()

  * @model

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public interface WorkflowContext extends EObject {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/WorkflowEngine.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/WorkflowEngine.java
index aca975a..01460ba 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/WorkflowEngine.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/WorkflowEngine.java
@@ -36,6 +36,8 @@
  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.RuntimePackage#getWorkflowEngine()

  * @model superTypes="org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.WorkflowRunnable"

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public interface WorkflowEngine extends EObject, Runnable {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/WorkflowEngineProxy.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/WorkflowEngineProxy.java
index 3d2c0ed..84ee378 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/WorkflowEngineProxy.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/WorkflowEngineProxy.java
@@ -29,6 +29,8 @@
  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.RuntimePackage#getWorkflowEngineProxy()

  * @model

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public interface WorkflowEngineProxy extends WorkflowEngine {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/WorkflowLog.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/WorkflowLog.java
index deecbc9..1d8e30e 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/WorkflowLog.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/WorkflowLog.java
@@ -39,6 +39,8 @@
  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.RuntimePackage#getWorkflowLog()

  * @model

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public interface WorkflowLog extends EObject {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/WorkflowLogEntry.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/WorkflowLogEntry.java
index a23ae06..239bb56 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/WorkflowLogEntry.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/WorkflowLogEntry.java
@@ -32,6 +32,8 @@
  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.RuntimePackage#getWorkflowLogEntry()

  * @model

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public interface WorkflowLogEntry extends EObject {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/WorkflowLogEntryType.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/WorkflowLogEntryType.java
index 73997cd..bccfa1f 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/WorkflowLogEntryType.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/WorkflowLogEntryType.java
@@ -27,6 +27,8 @@
  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.RuntimePackage#getWorkflowLogEntryType()

  * @model

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public enum WorkflowLogEntryType implements Enumerator {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/WorkflowLogResetter.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/WorkflowLogResetter.java
index f9fc142..aa03fb0 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/WorkflowLogResetter.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/WorkflowLogResetter.java
@@ -32,6 +32,8 @@
  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.RuntimePackage#getWorkflowLogResetter()

  * @model

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public interface WorkflowLogResetter extends IWorkflowVisitor {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/WorkflowRunner.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/WorkflowRunner.java
index 72d7ac3..a4cb1c8 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/WorkflowRunner.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/WorkflowRunner.java
@@ -33,6 +33,8 @@
  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.RuntimePackage#getWorkflowRunner()

  * @model superTypes="org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.WorkflowRunnable"

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public interface WorkflowRunner extends EObject, Runnable {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/WorkflowStateResetter.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/WorkflowStateResetter.java
index b8f9abd..683ecf5 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/WorkflowStateResetter.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/WorkflowStateResetter.java
@@ -32,6 +32,8 @@
  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.RuntimePackage#getWorkflowStateResetter()

  * @model

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public interface WorkflowStateResetter extends IWorkflowVisitor {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/WorkflowStateResolutionStrategy.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/WorkflowStateResolutionStrategy.java
index b13f82f..de3eb5c 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/WorkflowStateResolutionStrategy.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/WorkflowStateResolutionStrategy.java
@@ -28,6 +28,8 @@
  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.RuntimePackage#getWorkflowStateResolutionStrategy()

  * @model

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public interface WorkflowStateResolutionStrategy extends EObject {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/RuntimeFactoryImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/RuntimeFactoryImpl.java
index cdb0c58..48c7a81 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/RuntimeFactoryImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/RuntimeFactoryImpl.java
@@ -43,6 +43,8 @@
  * An implementation of the model <b>Factory</b>.

  * <!-- end-user-doc -->

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class RuntimeFactoryImpl extends EFactoryImpl implements RuntimeFactory {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/RuntimePackageImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/RuntimePackageImpl.java
index d945606..a4b0cb3 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/RuntimePackageImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/RuntimePackageImpl.java
@@ -58,6 +58,8 @@
  * An implementation of the model <b>Package</b>.

  * <!-- end-user-doc -->

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class RuntimePackageImpl extends EPackageImpl implements RuntimePackage {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowContextImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowContextImpl.java
index 3ba2739..847aa71 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowContextImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowContextImpl.java
@@ -17,28 +17,21 @@
 

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.common.notify.NotificationChain;

-

 import org.eclipse.emf.common.util.EMap;

-

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EStructuralFeature;

 import org.eclipse.emf.ecore.InternalEObject;

-

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 import org.eclipse.emf.ecore.impl.EObjectImpl;

-

 import org.eclipse.emf.ecore.util.EcoreEMap;

 import org.eclipse.emf.ecore.util.InternalEList;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.WorkflowComponent;

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.WorkflowParameter;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.RuntimePackage;

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.WorkflowContext;

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.WorkflowLog;

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.WorkflowLogEntryType;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.state.WorkflowState;

 

 /**

@@ -57,6 +50,8 @@
  * </p>

  *

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class WorkflowContextImpl extends EObjectImpl implements WorkflowContext {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowEngineImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowEngineImpl.java
index c99f82e..cd42f29 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowEngineImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowEngineImpl.java
@@ -17,19 +17,13 @@
 

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.common.notify.NotificationChain;

-

 import org.eclipse.emf.common.util.EList;

-

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

-

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

-

 import org.eclipse.emf.ecore.util.EObjectContainmentEList;

 import org.eclipse.emf.ecore.util.InternalEList;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.WorkflowComponent;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.RuntimePackage;

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.WorkflowContext;

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.WorkflowEngine;

@@ -48,6 +42,8 @@
  * </p>

  *

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class WorkflowEngineImpl extends WorkflowRunnableImpl implements WorkflowEngine {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowEngineProxyImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowEngineProxyImpl.java
index e402b38..91b9d9a 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowEngineProxyImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowEngineProxyImpl.java
@@ -14,12 +14,9 @@
 package org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.impl;

 

 import org.eclipse.emf.common.notify.Notification;

-

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

-

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.RuntimePackage;

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.WorkflowEngine;

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.WorkflowEngineProxy;

@@ -36,6 +33,8 @@
  * </p>

  *

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class WorkflowEngineProxyImpl extends WorkflowEngineImpl implements WorkflowEngineProxy {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowLogEntryImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowLogEntryImpl.java
index aae5a59..be3945a 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowLogEntryImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowLogEntryImpl.java
@@ -14,12 +14,9 @@
 package org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.impl;

 

 import org.eclipse.emf.common.notify.Notification;

-

 import org.eclipse.emf.ecore.EClass;

-

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 import org.eclipse.emf.ecore.impl.EObjectImpl;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.RuntimePackage;

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.WorkflowLogEntry;

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.WorkflowLogEntryType;

@@ -38,6 +35,8 @@
  * </p>

  *

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class WorkflowLogEntryImpl extends EObjectImpl implements WorkflowLogEntry {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowLogImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowLogImpl.java
index 2f22b40..5172c9d 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowLogImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowLogImpl.java
@@ -17,19 +17,14 @@
 

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.common.notify.NotificationChain;

-

 import org.eclipse.emf.common.util.EList;

-

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

-

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 import org.eclipse.emf.ecore.impl.EObjectImpl;

-

 import org.eclipse.emf.ecore.util.BasicFeatureMap;

 import org.eclipse.emf.ecore.util.FeatureMap;

 import org.eclipse.emf.ecore.util.InternalEList;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.RuntimePackage;

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.WorkflowLog;

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.WorkflowLogEntry;

@@ -52,6 +47,8 @@
  * </p>

  *

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class WorkflowLogImpl extends EObjectImpl implements WorkflowLog {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowLogMapImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowLogMapImpl.java
index 0750886..a6c7bdd 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowLogMapImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowLogMapImpl.java
@@ -15,19 +15,14 @@
 

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.common.notify.NotificationChain;

-

 import org.eclipse.emf.common.util.BasicEMap;

 import org.eclipse.emf.common.util.EMap;

-

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.InternalEObject;

-

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 import org.eclipse.emf.ecore.impl.EObjectImpl;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.WorkflowComponent;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.RuntimePackage;

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.WorkflowLog;

 

@@ -44,6 +39,8 @@
  * </p>

  *

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class WorkflowLogMapImpl extends EObjectImpl implements BasicEMap.Entry<WorkflowComponent,WorkflowLog> {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowLogResetterImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowLogResetterImpl.java
index 1dba392..e52de82 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowLogResetterImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowLogResetterImpl.java
@@ -14,16 +14,12 @@
 package org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.impl;

 

 import org.eclipse.emf.common.notify.Notification;

-

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

-

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 import org.eclipse.emf.ecore.impl.EObjectImpl;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.WorkflowCompositeComponent;

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.WorkflowUnitOfWork;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.RuntimePackage;

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.WorkflowContext;

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.WorkflowLogResetter;

@@ -40,6 +36,8 @@
  * </p>

  *

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class WorkflowLogResetterImpl extends EObjectImpl implements WorkflowLogResetter {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowParameterMapImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowParameterMapImpl.java
index d97e45d..e5059d2 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowParameterMapImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowParameterMapImpl.java
@@ -15,19 +15,14 @@
 

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.common.notify.NotificationChain;

-

 import org.eclipse.emf.common.util.BasicEMap;

 import org.eclipse.emf.common.util.EMap;

-

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.InternalEObject;

-

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 import org.eclipse.emf.ecore.impl.EObjectImpl;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.WorkflowParameter;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.RuntimePackage;

 

 /**

@@ -43,6 +38,8 @@
  * </p>

  *

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class WorkflowParameterMapImpl extends EObjectImpl implements BasicEMap.Entry<WorkflowParameter,EObject> {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowRunnableImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowRunnableImpl.java
index 33d3b92..c41a1be 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowRunnableImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowRunnableImpl.java
@@ -14,9 +14,7 @@
 package org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.impl;

 

 import org.eclipse.emf.ecore.EClass;

-

 import org.eclipse.emf.ecore.impl.EObjectImpl;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.RuntimePackage;

 

 /**

@@ -27,6 +25,8 @@
  * </p>

  *

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class WorkflowRunnableImpl extends EObjectImpl implements Runnable {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowRunnerImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowRunnerImpl.java
index 833c079..a6bc34e 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowRunnerImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowRunnerImpl.java
@@ -14,14 +14,10 @@
 package org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.impl;

 

 import org.eclipse.emf.common.notify.Notification;

-

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

-

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.WorkflowComponent;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.RuntimePackage;

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.WorkflowContext;

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.WorkflowRunner;

@@ -39,6 +35,8 @@
  * </p>

  *

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class WorkflowRunnerImpl extends WorkflowRunnableImpl implements WorkflowRunner {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowStateMapImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowStateMapImpl.java
index e620b7c..bf2d498 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowStateMapImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowStateMapImpl.java
@@ -15,21 +15,15 @@
 

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.common.notify.NotificationChain;

-

 import org.eclipse.emf.common.util.BasicEMap;

 import org.eclipse.emf.common.util.EMap;

-

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.InternalEObject;

-

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 import org.eclipse.emf.ecore.impl.EObjectImpl;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.WorkflowComponent;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.RuntimePackage;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.state.WorkflowState;

 

 /**

@@ -45,6 +39,8 @@
  * </p>

  *

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class WorkflowStateMapImpl extends EObjectImpl implements BasicEMap.Entry<WorkflowComponent,WorkflowState> {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowStateResetterImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowStateResetterImpl.java
index 05f8acd..2edcb0a 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowStateResetterImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowStateResetterImpl.java
@@ -14,16 +14,12 @@
 package org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.impl;

 

 import org.eclipse.emf.common.notify.Notification;

-

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

-

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 import org.eclipse.emf.ecore.impl.EObjectImpl;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.WorkflowCompositeComponent;

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.WorkflowUnitOfWork;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.RuntimePackage;

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.WorkflowContext;

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.WorkflowStateResetter;

@@ -40,6 +36,8 @@
  * </p>

  *

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class WorkflowStateResetterImpl extends EObjectImpl implements WorkflowStateResetter {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowStateResolutionStrategyImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowStateResolutionStrategyImpl.java
index d558f09..e4b3aaf 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowStateResolutionStrategyImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/impl/WorkflowStateResolutionStrategyImpl.java
@@ -14,15 +14,11 @@
 package org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.impl;

 

 import org.eclipse.emf.ecore.EClass;

-

 import org.eclipse.emf.ecore.impl.EObjectImpl;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.WorkflowCompositeComponent;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.RuntimePackage;

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.WorkflowContext;

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.WorkflowStateResolutionStrategy;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.state.WorkflowState;

 

 /**

@@ -33,6 +29,8 @@
  * </p>

  *

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class WorkflowStateResolutionStrategyImpl extends EObjectImpl implements WorkflowStateResolutionStrategy {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/StateFactory.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/StateFactory.java
index 51472d3..4859d2f 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/StateFactory.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/StateFactory.java
@@ -22,6 +22,8 @@
  * <!-- end-user-doc -->

  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.state.StatePackage

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public interface StateFactory extends EFactory {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/StatePackage.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/StatePackage.java
index 030f5c6..d3438e0 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/StatePackage.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/StatePackage.java
@@ -30,6 +30,8 @@
  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.state.StateFactory

  * @model kind="package"

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public interface StatePackage extends EPackage {

@@ -289,7 +291,10 @@
 	 * </ul>

 	 * <!-- end-user-doc -->

 	 * @generated

+	 * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+	 *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

 	 */

+	@Deprecated

 	interface Literals {

 		/**

 		 * The meta object literal for the '{@link org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.state.impl.WorkflowStateImpl <em>Workflow State</em>}' class.

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/WorkflowDoneState.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/WorkflowDoneState.java
index a275fcf..f02342d 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/WorkflowDoneState.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/WorkflowDoneState.java
@@ -23,6 +23,8 @@
  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.state.StatePackage#getWorkflowDoneState()

  * @model

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public interface WorkflowDoneState extends WorkflowState {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/WorkflowErrorState.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/WorkflowErrorState.java
index e738a8e..bbc5e3c 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/WorkflowErrorState.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/WorkflowErrorState.java
@@ -23,6 +23,8 @@
  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.state.StatePackage#getWorkflowErrorState()

  * @model

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public interface WorkflowErrorState extends WorkflowDoneState {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/WorkflowFailedState.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/WorkflowFailedState.java
index cb2cd7a..3b3e082 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/WorkflowFailedState.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/WorkflowFailedState.java
@@ -23,6 +23,8 @@
  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.state.StatePackage#getWorkflowFailedState()

  * @model

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public interface WorkflowFailedState extends WorkflowDoneState {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/WorkflowIdleState.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/WorkflowIdleState.java
index 3f7c4db..562e607 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/WorkflowIdleState.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/WorkflowIdleState.java
@@ -23,6 +23,8 @@
  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.state.StatePackage#getWorkflowIdleState()

  * @model

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public interface WorkflowIdleState extends WorkflowState {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/WorkflowRunningState.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/WorkflowRunningState.java
index d6dd397..079479f 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/WorkflowRunningState.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/WorkflowRunningState.java
@@ -23,6 +23,8 @@
  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.state.StatePackage#getWorkflowRunningState()

  * @model

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public interface WorkflowRunningState extends WorkflowState {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/WorkflowState.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/WorkflowState.java
index b3fed36..720a0d3 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/WorkflowState.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/WorkflowState.java
@@ -24,6 +24,8 @@
  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.state.StatePackage#getWorkflowState()

  * @model abstract="true"

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public interface WorkflowState extends EObject {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/WorkflowSuccessState.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/WorkflowSuccessState.java
index afaeb00..2daab61 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/WorkflowSuccessState.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/WorkflowSuccessState.java
@@ -23,6 +23,8 @@
  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.state.StatePackage#getWorkflowSuccessState()

  * @model

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public interface WorkflowSuccessState extends WorkflowDoneState {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/impl/StateFactoryImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/impl/StateFactoryImpl.java
index 24fba30..688c873 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/impl/StateFactoryImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/impl/StateFactoryImpl.java
@@ -16,11 +16,8 @@
 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EPackage;

-

 import org.eclipse.emf.ecore.impl.EFactoryImpl;

-

 import org.eclipse.emf.ecore.plugin.EcorePlugin;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.state.*;

 

 /**

@@ -28,6 +25,8 @@
  * An implementation of the model <b>Factory</b>.

  * <!-- end-user-doc -->

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class StateFactoryImpl extends EFactoryImpl implements StateFactory {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/impl/StatePackageImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/impl/StatePackageImpl.java
index 84968ce..3f8fb05 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/impl/StatePackageImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/impl/StatePackageImpl.java
@@ -16,21 +16,13 @@
 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EPackage;

 import org.eclipse.emf.ecore.EcorePackage;

-

 import org.eclipse.emf.ecore.impl.EPackageImpl;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.WorkflowPackage;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.impl.WorkflowPackageImpl;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.orchestration.OrchestrationPackage;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.orchestration.impl.OrchestrationPackageImpl;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.RuntimePackage;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.impl.RuntimePackageImpl;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.state.StateFactory;

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.state.StatePackage;

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.state.WorkflowDoneState;

@@ -46,6 +38,8 @@
  * An implementation of the model <b>Package</b>.

  * <!-- end-user-doc -->

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class StatePackageImpl extends EPackageImpl implements StatePackage {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/impl/WorkflowDoneStateImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/impl/WorkflowDoneStateImpl.java
index b8e8368..2f9bba1 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/impl/WorkflowDoneStateImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/impl/WorkflowDoneStateImpl.java
@@ -14,7 +14,6 @@
 package org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.state.impl;

 

 import org.eclipse.emf.ecore.EClass;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.state.StatePackage;

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.state.WorkflowDoneState;

 

@@ -26,6 +25,8 @@
  * </p>

  *

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class WorkflowDoneStateImpl extends WorkflowStateImpl implements WorkflowDoneState {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/impl/WorkflowErrorStateImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/impl/WorkflowErrorStateImpl.java
index 3c4878b..2c4fcf4 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/impl/WorkflowErrorStateImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/impl/WorkflowErrorStateImpl.java
@@ -14,7 +14,6 @@
 package org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.state.impl;

 

 import org.eclipse.emf.ecore.EClass;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.state.StatePackage;

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.state.WorkflowErrorState;

 

@@ -26,6 +25,8 @@
  * </p>

  *

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class WorkflowErrorStateImpl extends WorkflowDoneStateImpl implements WorkflowErrorState {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/impl/WorkflowFailedStateImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/impl/WorkflowFailedStateImpl.java
index a312383..86b8979 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/impl/WorkflowFailedStateImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/impl/WorkflowFailedStateImpl.java
@@ -14,7 +14,6 @@
 package org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.state.impl;

 

 import org.eclipse.emf.ecore.EClass;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.state.StatePackage;

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.state.WorkflowFailedState;

 

@@ -26,6 +25,8 @@
  * </p>

  *

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class WorkflowFailedStateImpl extends WorkflowDoneStateImpl implements WorkflowFailedState {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/impl/WorkflowIdleStateImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/impl/WorkflowIdleStateImpl.java
index 39055d5..c2e175b 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/impl/WorkflowIdleStateImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/impl/WorkflowIdleStateImpl.java
@@ -14,7 +14,6 @@
 package org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.state.impl;

 

 import org.eclipse.emf.ecore.EClass;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.state.StatePackage;

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.state.WorkflowIdleState;

 

@@ -26,6 +25,8 @@
  * </p>

  *

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class WorkflowIdleStateImpl extends WorkflowStateImpl implements WorkflowIdleState {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/impl/WorkflowRunningStateImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/impl/WorkflowRunningStateImpl.java
index 7ae66ee..3bc988b 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/impl/WorkflowRunningStateImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/impl/WorkflowRunningStateImpl.java
@@ -14,7 +14,6 @@
 package org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.state.impl;

 

 import org.eclipse.emf.ecore.EClass;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.state.StatePackage;

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.state.WorkflowRunningState;

 

@@ -26,6 +25,8 @@
  * </p>

  *

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class WorkflowRunningStateImpl extends WorkflowStateImpl implements WorkflowRunningState {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/impl/WorkflowStateImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/impl/WorkflowStateImpl.java
index b42d6c7..a75bbdf 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/impl/WorkflowStateImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/impl/WorkflowStateImpl.java
@@ -14,9 +14,7 @@
 package org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.state.impl;

 

 import org.eclipse.emf.ecore.EClass;

-

 import org.eclipse.emf.ecore.impl.EObjectImpl;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.state.StatePackage;

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.state.WorkflowState;

 

@@ -28,7 +26,10 @@
  * </p>

  *

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

+@Deprecated

 public abstract class WorkflowStateImpl extends EObjectImpl implements WorkflowState {

 	/**

 	 * <!-- begin-user-doc -->

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/impl/WorkflowSuccessStateImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/impl/WorkflowSuccessStateImpl.java
index 6d8962b..592fa6f 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/impl/WorkflowSuccessStateImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/impl/WorkflowSuccessStateImpl.java
@@ -14,7 +14,6 @@
 package org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.state.impl;

 

 import org.eclipse.emf.ecore.EClass;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.state.StatePackage;

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.state.WorkflowSuccessState;

 

@@ -26,6 +25,8 @@
  * </p>

  *

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class WorkflowSuccessStateImpl extends WorkflowDoneStateImpl implements WorkflowSuccessState {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/util/StateAdapterFactory.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/util/StateAdapterFactory.java
index a923522..b42440c 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/util/StateAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/util/StateAdapterFactory.java
@@ -15,11 +15,8 @@
 

 import org.eclipse.emf.common.notify.Adapter;

 import org.eclipse.emf.common.notify.Notifier;

-

 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

-

 import org.eclipse.emf.ecore.EObject;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.state.*;

 

 /**

@@ -29,6 +26,8 @@
  * <!-- end-user-doc -->

  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.state.StatePackage

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class StateAdapterFactory extends AdapterFactoryImpl {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/util/StateSwitch.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/util/StateSwitch.java
index ef14bd6..afa4f6b 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/util/StateSwitch.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/state/util/StateSwitch.java
@@ -17,7 +17,6 @@
 

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EObject;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.state.*;

 

 /**

@@ -32,6 +31,8 @@
  * <!-- end-user-doc -->

  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.state.StatePackage

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class StateSwitch<T> {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/util/RuntimeAdapterFactory.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/util/RuntimeAdapterFactory.java
index 22aa81b..b8025f2 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/util/RuntimeAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/util/RuntimeAdapterFactory.java
@@ -17,17 +17,12 @@
 

 import org.eclipse.emf.common.notify.Adapter;

 import org.eclipse.emf.common.notify.Notifier;

-

 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

-

 import org.eclipse.emf.ecore.EObject;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.IWorkflowVisitor;

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.WorkflowComponent;

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.WorkflowParameter;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.*;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.state.WorkflowState;

 

 /**

@@ -37,6 +32,8 @@
  * <!-- end-user-doc -->

  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.RuntimePackage

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class RuntimeAdapterFactory extends AdapterFactoryImpl {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/util/RuntimeResourceFactoryImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/util/RuntimeResourceFactoryImpl.java
index e0cd0c0..3634ac1 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/util/RuntimeResourceFactoryImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/util/RuntimeResourceFactoryImpl.java
@@ -14,11 +14,8 @@
 package org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.util;

 

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

-

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

-

 import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;

-

 import org.eclipse.emf.ecore.xmi.XMLResource;

 

 /**

@@ -27,6 +24,8 @@
  * <!-- end-user-doc -->

  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.util.RuntimeResourceImpl

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class RuntimeResourceFactoryImpl extends ResourceFactoryImpl {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/util/RuntimeResourceImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/util/RuntimeResourceImpl.java
index e704d56..30bf5f4 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/util/RuntimeResourceImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/util/RuntimeResourceImpl.java
@@ -14,7 +14,6 @@
 package org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.util;

 

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

-

 import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;

 

 /**

@@ -23,6 +22,8 @@
  * <!-- end-user-doc -->

  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.util.RuntimeResourceFactoryImpl

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class RuntimeResourceImpl extends XMLResourceImpl {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/util/RuntimeSwitch.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/util/RuntimeSwitch.java
index aeb9923..21ec251 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/util/RuntimeSwitch.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/util/RuntimeSwitch.java
@@ -18,13 +18,10 @@
 

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EObject;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.IWorkflowVisitor;

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.WorkflowComponent;

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.WorkflowParameter;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.*;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.state.WorkflowState;

 

 /**

@@ -39,6 +36,8 @@
  * <!-- end-user-doc -->

  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.RuntimePackage

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class RuntimeSwitch<T> {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/util/RuntimeXMLProcessor.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/util/RuntimeXMLProcessor.java
index 4fe70f3..b80a5f1 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/util/RuntimeXMLProcessor.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/runtime/util/RuntimeXMLProcessor.java
@@ -16,11 +16,8 @@
 import java.util.Map;

 

 import org.eclipse.emf.ecore.EPackage;

-

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

-

 import org.eclipse.emf.ecore.xmi.util.XMLProcessor;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.runtime.RuntimePackage;

 

 /**

@@ -28,6 +25,8 @@
  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class RuntimeXMLProcessor extends XMLProcessor {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/util/WorkflowAdapterFactory.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/util/WorkflowAdapterFactory.java
index 8b4e56a..a396ca3 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/util/WorkflowAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/util/WorkflowAdapterFactory.java
@@ -15,11 +15,8 @@
 

 import org.eclipse.emf.common.notify.Adapter;

 import org.eclipse.emf.common.notify.Notifier;

-

 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

-

 import org.eclipse.emf.ecore.EObject;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.*;

 

 /**

@@ -29,6 +26,8 @@
  * <!-- end-user-doc -->

  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.WorkflowPackage

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class WorkflowAdapterFactory extends AdapterFactoryImpl {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/util/WorkflowResourceFactoryImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/util/WorkflowResourceFactoryImpl.java
index a376450..f45c021 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/util/WorkflowResourceFactoryImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/util/WorkflowResourceFactoryImpl.java
@@ -14,11 +14,8 @@
 package org.eclipse.gmt.modisco.workflow.mwe.workflow.util;

 

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

-

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

-

 import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;

-

 import org.eclipse.emf.ecore.xmi.XMLResource;

 

 /**

@@ -27,6 +24,8 @@
  * <!-- end-user-doc -->

  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.util.WorkflowResourceImpl

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class WorkflowResourceFactoryImpl extends ResourceFactoryImpl {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/util/WorkflowResourceImpl.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/util/WorkflowResourceImpl.java
index f3edb78..c4bd380 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/util/WorkflowResourceImpl.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/util/WorkflowResourceImpl.java
@@ -14,7 +14,6 @@
 package org.eclipse.gmt.modisco.workflow.mwe.workflow.util;

 

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

-

 import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;

 

 /**

@@ -23,6 +22,8 @@
  * <!-- end-user-doc -->

  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.util.WorkflowResourceFactoryImpl

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class WorkflowResourceImpl extends XMLResourceImpl {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/util/WorkflowSwitch.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/util/WorkflowSwitch.java
index 8d6c564..e9fd11a 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/util/WorkflowSwitch.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/util/WorkflowSwitch.java
@@ -17,7 +17,6 @@
 

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EObject;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.*;

 

 /**

@@ -32,6 +31,8 @@
  * <!-- end-user-doc -->

  * @see org.eclipse.gmt.modisco.workflow.mwe.workflow.WorkflowPackage

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class WorkflowSwitch<T> {

diff --git a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/util/WorkflowXMLProcessor.java b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/util/WorkflowXMLProcessor.java
index e8fa7df..81749fb 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/util/WorkflowXMLProcessor.java
+++ b/org.eclipse.gmt.modisco.workflow.mwe/src/org/eclipse/gmt/modisco/workflow/mwe/workflow/util/WorkflowXMLProcessor.java
@@ -16,11 +16,8 @@
 import java.util.Map;

 

 import org.eclipse.emf.ecore.EPackage;

-

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

-

 import org.eclipse.emf.ecore.xmi.util.XMLProcessor;

-

 import org.eclipse.gmt.modisco.workflow.mwe.workflow.WorkflowPackage;

 

 /**

@@ -28,6 +25,8 @@
  * <!-- begin-user-doc -->

  * <!-- end-user-doc -->

  * @generated

+ * @deprecated replaced by org.eclipse.modisco.workflow.mwe, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337969

  */

 @Deprecated
 public class WorkflowXMLProcessor extends XMLProcessor {

diff --git a/org.eclipse.gmt.modisco.workflow/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.workflow/META-INF/MANIFEST.MF
index eecb031..606efbf 100644
--- a/org.eclipse.gmt.modisco.workflow/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.workflow/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.gmt.modisco.workflow;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.gmt.modisco.workflow.Activator
diff --git a/org.eclipse.gmt.modisco.workflow/plugin.properties b/org.eclipse.gmt.modisco.workflow/plugin.properties
index 2a09a4a..5bcfdfc 100644
--- a/org.eclipse.gmt.modisco.workflow/plugin.properties
+++ b/org.eclipse.gmt.modisco.workflow/plugin.properties
@@ -9,7 +9,7 @@
 #    Gabriel Barbier (Mia-Software) - initial API and implementation

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

 # NLS_MESSAGEFORMAT_VAR

-pluginName=MoDisco Workflow (Incubation)

+pluginName=MoDisco Workflow (Deprecated, replaced by org.eclipse.modisco.workflow) (Incubation)

 providerName=Eclipse Modeling Project

 

 launchConfigurationType.name = MoDisco Workflow

diff --git a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/AbstractDriverCore.java b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/AbstractDriverCore.java
index 1341d22..348b50c 100644
--- a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/AbstractDriverCore.java
+++ b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/AbstractDriverCore.java
@@ -27,7 +27,10 @@
 import org.eclipse.gmt.modisco.workflow.modiscoworkflow.impl.ModiscoworkflowFactoryImpl;

 import org.eclipse.gmt.modisco.workflow.modiscoworkflow.impl.WorkParameterEntryValueImpl;

 

-/** @deprecated no Driver needed anymore */

+/**

+ * @deprecated no Driver needed anymore, replaced by org.eclipse.modisco.workflow, cf

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337942

+ */

 @Deprecated

 public abstract class AbstractDriverCore implements Driver {

 

diff --git a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/Activator.java b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/Activator.java
index 0e5d068..86a5788 100644
--- a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/Activator.java
+++ b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/Activator.java
@@ -14,7 +14,10 @@
 import org.eclipse.ui.plugin.AbstractUIPlugin;

 import org.osgi.framework.BundleContext;

 

-/** @deprecated */

+/**

+ * @deprecated , replaced by org.eclipse.modisco.workflow, cf

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337942

+ */

 @Deprecated

 public class Activator extends AbstractUIPlugin {

 	// The plug-in ID

diff --git a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/Constants.java b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/Constants.java
index 46338da..9a0dac8 100644
--- a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/Constants.java
+++ b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/Constants.java
@@ -11,7 +11,10 @@
  */

 package org.eclipse.gmt.modisco.workflow;

 

-/** @deprecated */

+/**

+ * @deprecated replaced by org.eclipse.modisco.workflow, cf

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337942

+ */

 @Deprecated

 public final class Constants {

 

diff --git a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/Driver.java b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/Driver.java
index b2a04b5..9903ac6 100644
--- a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/Driver.java
+++ b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/Driver.java
@@ -19,7 +19,8 @@
  * API to define the driver core

  * 

  * @author Nicolas Payneau

- * @deprecated no Driver needed anymore

+ * @deprecated no Driver needed anymore, replaced by org.eclipse.modisco.workflow, cf

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337942

  */

 @Deprecated

 public interface Driver {

diff --git a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/Messages.java b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/Messages.java
index 31e7638..db915c5 100644
--- a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/Messages.java
+++ b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/Messages.java
@@ -12,7 +12,10 @@
 

 import org.eclipse.osgi.util.NLS;

 

-/** @deprecated */

+/**

+ * @deprecated replaced by org.eclipse.modisco.workflow, cf

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337942

+ */

 @Deprecated

 public class Messages extends NLS {

 	private static final String BUNDLE_NAME = "org.eclipse.gmt.modisco.workflow.messages"; //$NON-NLS-1$

diff --git a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/WorkflowController.java b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/WorkflowController.java
index 8aefbea..4178a7b 100644
--- a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/WorkflowController.java
+++ b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/WorkflowController.java
@@ -13,7 +13,10 @@
 

 import org.eclipse.debug.core.ILaunchConfiguration;

 

-/** @deprecated */

+/**

+ * @deprecated replaced by org.eclipse.modisco.workflow, cf

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337942

+ */

 @Deprecated

 public interface WorkflowController {

 

diff --git a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/WorkflowExecution.java b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/WorkflowExecution.java
index 2543945..054fc8e 100644
--- a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/WorkflowExecution.java
+++ b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/WorkflowExecution.java
@@ -19,7 +19,8 @@
  * API to launch the workflow

  * 

  * @author Nicolas Payneau

- * @deprecated

+ * @deprecated replaced by org.eclipse.modisco.workflow, cf

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337942

  */

 @Deprecated

 public interface WorkflowExecution {

diff --git a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/WorkflowModel.java b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/WorkflowModel.java
index 83128a9..781126a 100644
--- a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/WorkflowModel.java
+++ b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/WorkflowModel.java
@@ -22,7 +22,8 @@
  * API to define the workflow core

  * 

  * @author Nicolas Payneau

- * @deprecated

+ * @deprecated replaced by org.eclipse.modisco.workflow, cf

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337942

  */

 @Deprecated

 public interface WorkflowModel extends Workflow, WorkflowModelEventsSubscribe {

diff --git a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/WorkflowModelEvents.java b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/WorkflowModelEvents.java
index 026246e..3c1d002 100644
--- a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/WorkflowModelEvents.java
+++ b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/WorkflowModelEvents.java
@@ -12,7 +12,10 @@
 

 import org.eclipse.gmt.modisco.workflow.modiscoworkflow.Element;

 

-/** @deprecated */

+/**

+ * @deprecated replaced by org.eclipse.modisco.workflow, cf

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337942

+ */

 @Deprecated

 public interface WorkflowModelEvents {

 

diff --git a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/WorkflowModelEventsSubscribe.java b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/WorkflowModelEventsSubscribe.java
index 4d505ba..1a8428a 100644
--- a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/WorkflowModelEventsSubscribe.java
+++ b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/WorkflowModelEventsSubscribe.java
@@ -10,7 +10,10 @@
  */

 package org.eclipse.gmt.modisco.workflow;

 

-/** @deprecated */

+/**

+ * @deprecated replaced by org.eclipse.modisco.workflow, cf

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337942

+ */

 @Deprecated

 public interface WorkflowModelEventsSubscribe {

 

diff --git a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/actions/MoDiscoWorkflowDelegate.java b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/actions/MoDiscoWorkflowDelegate.java
index be8a1c7..baa745d 100644
--- a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/actions/MoDiscoWorkflowDelegate.java
+++ b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/actions/MoDiscoWorkflowDelegate.java
@@ -23,7 +23,8 @@
  * This class defines the delegate to launch a configuration of MoDiscoWorkflow type.

  * 

  * @author Nicolas Payneau

- * @deprecated

+ * @deprecated replaced by org.eclipse.modisco.workflow, cf

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337942

  */

 @Deprecated

 public class MoDiscoWorkflowDelegate implements ILaunchConfigurationDelegate {

diff --git a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/generator/GenerateDiscoverer.java b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/generator/GenerateDiscoverer.java
index d24f2d3..68f7dae 100644
--- a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/generator/GenerateDiscoverer.java
+++ b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/generator/GenerateDiscoverer.java
@@ -33,7 +33,8 @@
  * Entry point of the 'GenerateDiscoverer' generation module.

  * 

  * @generated NOT

- * @deprecated

+ * @deprecated replaced by org.eclipse.modisco.workflow, cf

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337942

  */

 @Deprecated

 public class GenerateDiscoverer extends AbstractAcceleoGenerator {

diff --git a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/Direction.java b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/Direction.java
index d1eb658..9a20c72 100644
--- a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/Direction.java
+++ b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/Direction.java
@@ -23,8 +23,10 @@
  * @see org.eclipse.gmt.modisco.workflow.modiscoworkflow.ModiscoworkflowPackage#getDirection()

  * @model

  * @generated

- * @deprecated

+ * @deprecated replaced by org.eclipse.modisco.workflow, cf

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337942

  */

+@Deprecated

 public enum Direction implements Enumerator {

 	/**

 	 * The '<em><b>In</b></em>' literal object. <!-- begin-user-doc --> <!-- end-user-doc -->

diff --git a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/Element.java b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/Element.java
index c771ecf..dd65d16 100644
--- a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/Element.java
+++ b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/Element.java
@@ -28,7 +28,8 @@
  * @see org.eclipse.gmt.modisco.workflow.modiscoworkflow.ModiscoworkflowPackage#getElement()

  * @model abstract="true"

  * @generated

- * @deprecated

+ * @deprecated replaced by org.eclipse.modisco.workflow, cf

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337942

  */

 @Deprecated

 public interface Element extends EObject {

diff --git a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/ExportInfos.java b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/ExportInfos.java
index 52d0d18..e6e8f52 100644
--- a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/ExportInfos.java
+++ b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/ExportInfos.java
@@ -30,7 +30,8 @@
  * @see org.eclipse.gmt.modisco.workflow.modiscoworkflow.ModiscoworkflowPackage#getExportInfos()

  * @model

  * @generated

- * @deprecated

+ * @deprecated replaced by org.eclipse.modisco.workflow, cf

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337942

  */

 @Deprecated

 public interface ExportInfos extends EObject {

diff --git a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/ModiscoworkflowFactory.java b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/ModiscoworkflowFactory.java
index 7ab0fa3..864a7fc 100644
--- a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/ModiscoworkflowFactory.java
+++ b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/ModiscoworkflowFactory.java
@@ -18,7 +18,8 @@
  * 

  * @see org.eclipse.gmt.modisco.workflow.modiscoworkflow.ModiscoworkflowPackage

  * @generated

- * @deprecated

+ * @deprecated replaced by org.eclipse.modisco.workflow, cf

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337942

  */

 @Deprecated

 public interface ModiscoworkflowFactory extends EFactory {

diff --git a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/ModiscoworkflowPackage.java b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/ModiscoworkflowPackage.java
index 5e5df2c..f46e35e 100644
--- a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/ModiscoworkflowPackage.java
+++ b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/ModiscoworkflowPackage.java
@@ -30,7 +30,8 @@
  * @see org.eclipse.gmt.modisco.workflow.modiscoworkflow.ModiscoworkflowFactory

  * @model kind="package"

  * @generated

- * @deprecated

+ * @deprecated replaced by org.eclipse.modisco.workflow, cf

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337942

  */

 @Deprecated

 public interface ModiscoworkflowPackage extends EPackage {

diff --git a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/Work.java b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/Work.java
index e09ee38..2945c17 100644
--- a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/Work.java
+++ b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/Work.java
@@ -27,7 +27,8 @@
  * @see org.eclipse.gmt.modisco.workflow.modiscoworkflow.ModiscoworkflowPackage#getWork()

  * @model

  * @generated

- * @deprecated

+ * @deprecated replaced by org.eclipse.modisco.workflow, cf

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337942

  */

 @Deprecated

 public interface Work extends Element {

diff --git a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/WorkParameter.java b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/WorkParameter.java
index 7ce2061..96cd281 100644
--- a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/WorkParameter.java
+++ b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/WorkParameter.java
@@ -35,7 +35,8 @@
  * @see org.eclipse.gmt.modisco.workflow.modiscoworkflow.ModiscoworkflowPackage#getWorkParameter()

  * @model

  * @generated

- * @deprecated

+ * @deprecated replaced by org.eclipse.modisco.workflow, cf

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337942

  */

 @Deprecated

 public interface WorkParameter extends EObject {

diff --git a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/WorkParameterBooleanValue.java b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/WorkParameterBooleanValue.java
index 37a3f33..9476f12 100644
--- a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/WorkParameterBooleanValue.java
+++ b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/WorkParameterBooleanValue.java
@@ -25,7 +25,8 @@
  * @see org.eclipse.gmt.modisco.workflow.modiscoworkflow.ModiscoworkflowPackage#getWorkParameterBooleanValue()

  * @model

  * @generated

- * @deprecated

+ * @deprecated replaced by org.eclipse.modisco.workflow, cf

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337942

  */

 @Deprecated

 public interface WorkParameterBooleanValue extends WorkParameterValue {

diff --git a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/WorkParameterIntegerValue.java b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/WorkParameterIntegerValue.java
index 55efc0e..39409d8 100644
--- a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/WorkParameterIntegerValue.java
+++ b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/WorkParameterIntegerValue.java
@@ -25,7 +25,8 @@
  * @see org.eclipse.gmt.modisco.workflow.modiscoworkflow.ModiscoworkflowPackage#getWorkParameterIntegerValue()

  * @model

  * @generated

- * @deprecated

+ * @deprecated replaced by org.eclipse.modisco.workflow, cf

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337942

  */

 @Deprecated

 public interface WorkParameterIntegerValue extends WorkParameterValue {

diff --git a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/WorkParameterMapValue.java b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/WorkParameterMapValue.java
index f55f652..7e8a4ff 100644
--- a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/WorkParameterMapValue.java
+++ b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/WorkParameterMapValue.java
@@ -27,7 +27,8 @@
  * @see org.eclipse.gmt.modisco.workflow.modiscoworkflow.ModiscoworkflowPackage#getWorkParameterMapValue()

  * @model

  * @generated

- * @deprecated

+ * @deprecated replaced by org.eclipse.modisco.workflow, cf

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337942

  */

 @Deprecated

 public interface WorkParameterMapValue extends WorkParameterValue {

diff --git a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/WorkParameterStringListValue.java b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/WorkParameterStringListValue.java
index e054309..1c212b6 100644
--- a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/WorkParameterStringListValue.java
+++ b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/WorkParameterStringListValue.java
@@ -28,7 +28,8 @@
  * @see org.eclipse.gmt.modisco.workflow.modiscoworkflow.ModiscoworkflowPackage#getWorkParameterStringListValue()

  * @model

  * @generated

- * @deprecated

+ * @deprecated replaced by org.eclipse.modisco.workflow, cf

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337942

  */

 @Deprecated

 public interface WorkParameterStringListValue extends WorkParameterValue {

diff --git a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/WorkParameterStringValue.java b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/WorkParameterStringValue.java
index 8b7a3cd..db7bc09 100644
--- a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/WorkParameterStringValue.java
+++ b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/WorkParameterStringValue.java
@@ -25,7 +25,8 @@
  * @see org.eclipse.gmt.modisco.workflow.modiscoworkflow.ModiscoworkflowPackage#getWorkParameterStringValue()

  * @model

  * @generated

- * @deprecated

+ * @deprecated replaced by org.eclipse.modisco.workflow, cf

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337942

  */

 @Deprecated

 public interface WorkParameterStringValue extends WorkParameterValue {

diff --git a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/WorkParameterValue.java b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/WorkParameterValue.java
index febf813..b348bcb 100644
--- a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/WorkParameterValue.java
+++ b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/WorkParameterValue.java
@@ -20,7 +20,8 @@
  * @see org.eclipse.gmt.modisco.workflow.modiscoworkflow.ModiscoworkflowPackage#getWorkParameterValue()

  * @model interface="true" abstract="true"

  * @generated

- * @deprecated

+ * @deprecated replaced by org.eclipse.modisco.workflow, cf

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337942

  */

 @Deprecated

 public interface WorkParameterValue extends EObject {

diff --git a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/Workflow.java b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/Workflow.java
index 4dbeded..78c61fc 100644
--- a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/Workflow.java
+++ b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/Workflow.java
@@ -27,7 +27,8 @@
  * @see org.eclipse.gmt.modisco.workflow.modiscoworkflow.ModiscoworkflowPackage#getWorkflow()

  * @model

  * @generated

- * @deprecated

+ * @deprecated replaced by org.eclipse.modisco.workflow, cf

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337942

  */

 @Deprecated

 public interface Workflow extends Element, ExportInfos {

diff --git a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/ElementImpl.java b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/ElementImpl.java
index 3465964..6fb8eae 100644
--- a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/ElementImpl.java
+++ b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/ElementImpl.java
@@ -34,7 +34,8 @@
  * </p>

  * 

  * @generated

- * @deprecated

+ * @deprecated replaced by org.eclipse.modisco.workflow, cf

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337942

  */

 @Deprecated

 public abstract class ElementImpl extends EObjectImpl implements Element {

diff --git a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/ExportInfosImpl.java b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/ExportInfosImpl.java
index 3b9a81b..bcb1a97 100644
--- a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/ExportInfosImpl.java
+++ b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/ExportInfosImpl.java
@@ -33,7 +33,8 @@
  * </p>

  * 

  * @generated

- * @deprecated

+ * @deprecated replaced by org.eclipse.modisco.workflow, cf

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337942

  */

 @Deprecated

 public class ExportInfosImpl extends EObjectImpl implements ExportInfos {

diff --git a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/ModiscoworkflowFactoryImpl.java b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/ModiscoworkflowFactoryImpl.java
index b34714f..b544613 100644
--- a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/ModiscoworkflowFactoryImpl.java
+++ b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/ModiscoworkflowFactoryImpl.java
@@ -36,7 +36,8 @@
  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->

  * 

  * @generated

- * @deprecated

+ * @deprecated replaced by org.eclipse.modisco.workflow, cf

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337942

  */

 @Deprecated

 public class ModiscoworkflowFactoryImpl extends EFactoryImpl implements ModiscoworkflowFactory {

diff --git a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/ModiscoworkflowPackageImpl.java b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/ModiscoworkflowPackageImpl.java
index cdcd80d..de0285a 100644
--- a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/ModiscoworkflowPackageImpl.java
+++ b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/ModiscoworkflowPackageImpl.java
@@ -37,7 +37,8 @@
  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->

  * 

  * @generated

- * @deprecated

+ * @deprecated replaced by org.eclipse.modisco.workflow, cf

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337942

  */

 @Deprecated

 public class ModiscoworkflowPackageImpl extends EPackageImpl implements ModiscoworkflowPackage {

diff --git a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/WorkImpl.java b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/WorkImpl.java
index 65523dc..62db1fc 100644
--- a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/WorkImpl.java
+++ b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/WorkImpl.java
@@ -34,7 +34,8 @@
  * </p>

  * 

  * @generated

- * @deprecated

+ * @deprecated replaced by org.eclipse.modisco.workflow, cf

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337942

  */

 @Deprecated

 public class WorkImpl extends ElementImpl implements Work {

diff --git a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/WorkParameterBooleanValueImpl.java b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/WorkParameterBooleanValueImpl.java
index 9952fe8..108d7ac 100644
--- a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/WorkParameterBooleanValueImpl.java
+++ b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/WorkParameterBooleanValueImpl.java
@@ -30,7 +30,8 @@
  * </p>

  * 

  * @generated

- * @deprecated

+ * @deprecated replaced by org.eclipse.modisco.workflow, cf

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337942

  */

 @Deprecated

 public class WorkParameterBooleanValueImpl extends EObjectImpl implements WorkParameterBooleanValue {

diff --git a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/WorkParameterEntryValueImpl.java b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/WorkParameterEntryValueImpl.java
index f829b6c..0289a60 100644
--- a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/WorkParameterEntryValueImpl.java
+++ b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/WorkParameterEntryValueImpl.java
@@ -38,7 +38,8 @@
  * </p>

  * 

  * @generated

- * @deprecated

+ * @deprecated replaced by org.eclipse.modisco.workflow, cf

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337942

  */

 @Deprecated

 public class WorkParameterEntryValueImpl extends EObjectImpl implements

diff --git a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/WorkParameterImpl.java b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/WorkParameterImpl.java
index a552eca..f05d712 100644
--- a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/WorkParameterImpl.java
+++ b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/WorkParameterImpl.java
@@ -44,7 +44,8 @@
  * </p>

  * 

  * @generated

- * @deprecated

+ * @deprecated replaced by org.eclipse.modisco.workflow, cf

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337942

  */

 @Deprecated

 public class WorkParameterImpl extends EObjectImpl implements WorkParameter {

diff --git a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/WorkParameterIntegerValueImpl.java b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/WorkParameterIntegerValueImpl.java
index 2f3a73d..03debe9 100644
--- a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/WorkParameterIntegerValueImpl.java
+++ b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/WorkParameterIntegerValueImpl.java
@@ -30,7 +30,8 @@
  * </p>

  * 

  * @generated

- * @deprecated

+ * @deprecated replaced by org.eclipse.modisco.workflow, cf

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337942

  */

 @Deprecated

 public class WorkParameterIntegerValueImpl extends EObjectImpl implements WorkParameterIntegerValue {

diff --git a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/WorkParameterMapValueImpl.java b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/WorkParameterMapValueImpl.java
index 897eb09..67b228f 100644
--- a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/WorkParameterMapValueImpl.java
+++ b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/WorkParameterMapValueImpl.java
@@ -35,7 +35,8 @@
  * </p>

  * 

  * @generated

- * @deprecated

+ * @deprecated replaced by org.eclipse.modisco.workflow, cf

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337942

  */

 @Deprecated

 public class WorkParameterMapValueImpl extends EObjectImpl implements WorkParameterMapValue {

diff --git a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/WorkParameterStringListValueImpl.java b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/WorkParameterStringListValueImpl.java
index 73389e4..8b71ac3 100644
--- a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/WorkParameterStringListValueImpl.java
+++ b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/WorkParameterStringListValueImpl.java
@@ -32,7 +32,8 @@
  * </p>

  * 

  * @generated

- * @deprecated

+ * @deprecated replaced by org.eclipse.modisco.workflow, cf

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337942

  */

 @Deprecated

 public class WorkParameterStringListValueImpl extends EObjectImpl implements

diff --git a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/WorkParameterStringValueImpl.java b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/WorkParameterStringValueImpl.java
index bb29ca7..a3e0175 100644
--- a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/WorkParameterStringValueImpl.java
+++ b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/WorkParameterStringValueImpl.java
@@ -30,7 +30,8 @@
  * </p>

  * 

  * @generated

- * @deprecated

+ * @deprecated replaced by org.eclipse.modisco.workflow, cf

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337942

  */

 @Deprecated

 public class WorkParameterStringValueImpl extends EObjectImpl implements WorkParameterStringValue {

diff --git a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/WorkflowImpl.java b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/WorkflowImpl.java
index 15f908f..e2fee78 100644
--- a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/WorkflowImpl.java
+++ b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/impl/WorkflowImpl.java
@@ -43,7 +43,8 @@
  * </p>

  * 

  * @generated

- * @deprecated

+ * @deprecated replaced by org.eclipse.modisco.workflow, cf

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337942

  */

 @Deprecated

 public class WorkflowImpl extends ElementImpl implements Workflow {

diff --git a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/util/ModiscoworkflowAdapterFactory.java b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/util/ModiscoworkflowAdapterFactory.java
index 8adf54f..277b75a 100644
--- a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/util/ModiscoworkflowAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/util/ModiscoworkflowAdapterFactory.java
@@ -35,7 +35,8 @@
  * 

  * @see org.eclipse.gmt.modisco.workflow.modiscoworkflow.ModiscoworkflowPackage

  * @generated

- * @deprecated

+ * @deprecated replaced by org.eclipse.modisco.workflow, cf

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337942

  */

 @Deprecated

 public class ModiscoworkflowAdapterFactory extends AdapterFactoryImpl {

diff --git a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/util/ModiscoworkflowSwitch.java b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/util/ModiscoworkflowSwitch.java
index cbd76df..c571872 100644
--- a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/util/ModiscoworkflowSwitch.java
+++ b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/modiscoworkflow/util/ModiscoworkflowSwitch.java
@@ -37,7 +37,8 @@
  * 

  * @see org.eclipse.gmt.modisco.workflow.modiscoworkflow.ModiscoworkflowPackage

  * @generated

- * @deprecated

+ * @deprecated replaced by org.eclipse.modisco.workflow, cf

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337942

  */

 @SuppressWarnings("all")

 public class ModiscoworkflowSwitch<T> {

diff --git a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/ui/MoDiscoWorkflowTabGroup.java b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/ui/MoDiscoWorkflowTabGroup.java
index 052077f..5d8f64d 100644
--- a/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/ui/MoDiscoWorkflowTabGroup.java
+++ b/org.eclipse.gmt.modisco.workflow/src/org/eclipse/gmt/modisco/workflow/ui/MoDiscoWorkflowTabGroup.java
@@ -20,7 +20,8 @@
 /**

  * 

  * @author Nicolas Payneau

- * @deprecated

+ * @deprecated replaced by org.eclipse.modisco.workflow, cf

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=337942

  */

 @Deprecated

 public class MoDiscoWorkflowTabGroup extends AbstractLaunchConfigurationTabGroup {

diff --git a/org.eclipse.gmt.modisco.xml.browser.customization/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.xml.browser.customization/META-INF/MANIFEST.MF
index 5c251b1..35adcfb 100644
--- a/org.eclipse.gmt.modisco.xml.browser.customization/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.xml.browser.customization/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.gmt.modisco.xml.browser.customization;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Require-Bundle: org.eclipse.gmt.modisco.infra.query.core
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %Bundle-Vendor
diff --git a/org.eclipse.gmt.modisco.xml.discoverer.tests/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.xml.discoverer.tests/META-INF/MANIFEST.MF
index 95d82d6..e57a559 100644
--- a/org.eclipse.gmt.modisco.xml.discoverer.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.xml.discoverer.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.gmt.modisco.xml.discoverer.tests
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.gmt.modisco.xml.discoverer.tests.JUnitPlugin
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.gmt.modisco.xml.discoverer.tests/OSGI-INF/l10n/bundle.properties b/org.eclipse.gmt.modisco.xml.discoverer.tests/OSGI-INF/l10n/bundle.properties
index feaad42..bf3253e 100644
--- a/org.eclipse.gmt.modisco.xml.discoverer.tests/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.gmt.modisco.xml.discoverer.tests/OSGI-INF/l10n/bundle.properties
@@ -10,4 +10,4 @@
 ###############################################################################

 #Properties file for org.eclipse.gmt.modisco.xml.discoverer.tests

 Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = MoDisco XML Discoverer tests (Incubation)
\ No newline at end of file
+Bundle-Name = MoDisco XML Discoverer tests (Deprecated) (Incubation)
\ No newline at end of file
diff --git a/org.eclipse.gmt.modisco.xml.discoverer.tests/src/org/eclipse/gmt/modisco/xml/discoverer/tests/AllTestsInUIThread.java b/org.eclipse.gmt.modisco.xml.discoverer.tests/src/org/eclipse/gmt/modisco/xml/discoverer/tests/AllTestsInUIThread.java
index 8b3cc93..2c7696e 100644
--- a/org.eclipse.gmt.modisco.xml.discoverer.tests/src/org/eclipse/gmt/modisco/xml/discoverer/tests/AllTestsInUIThread.java
+++ b/org.eclipse.gmt.modisco.xml.discoverer.tests/src/org/eclipse/gmt/modisco/xml/discoverer/tests/AllTestsInUIThread.java
@@ -15,6 +15,10 @@
 import org.junit.runners.Suite;

 import org.junit.runners.Suite.SuiteClasses;

 

+/**

+ * @deprecated cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470885

+ */

+@Deprecated

 @RunWith(Suite.class)

 @SuiteClasses({ Test001.class, Test002.class })

 public class AllTestsInUIThread {

diff --git a/org.eclipse.gmt.modisco.xml.discoverer.tests/src/org/eclipse/gmt/modisco/xml/discoverer/tests/JUnitPlugin.java b/org.eclipse.gmt.modisco.xml.discoverer.tests/src/org/eclipse/gmt/modisco/xml/discoverer/tests/JUnitPlugin.java
index aa1538c..c094b64 100644
--- a/org.eclipse.gmt.modisco.xml.discoverer.tests/src/org/eclipse/gmt/modisco/xml/discoverer/tests/JUnitPlugin.java
+++ b/org.eclipse.gmt.modisco.xml.discoverer.tests/src/org/eclipse/gmt/modisco/xml/discoverer/tests/JUnitPlugin.java
@@ -19,7 +19,9 @@
 

 /**

  * The activator class controls the plug-in life cycle

+ * @deprecated cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470885

  */

+@Deprecated

 public class JUnitPlugin extends Plugin {

 

 	// The plug-in ID

diff --git a/org.eclipse.gmt.modisco.xml.discoverer.tests/src/org/eclipse/gmt/modisco/xml/discoverer/tests/Test001.java b/org.eclipse.gmt.modisco.xml.discoverer.tests/src/org/eclipse/gmt/modisco/xml/discoverer/tests/Test001.java
index e36049d..d0595d1 100644
--- a/org.eclipse.gmt.modisco.xml.discoverer.tests/src/org/eclipse/gmt/modisco/xml/discoverer/tests/Test001.java
+++ b/org.eclipse.gmt.modisco.xml.discoverer.tests/src/org/eclipse/gmt/modisco/xml/discoverer/tests/Test001.java
@@ -44,8 +44,9 @@
 

 /**

  * Basic test of discovering a XML model and testing root, element, comments

- * 

+ * @deprecated cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470885

  */

+@Deprecated

 public class Test001 {

 

 	private static final String TEST1_XML = "Test001.xml"; //$NON-NLS-1$

diff --git a/org.eclipse.gmt.modisco.xml.discoverer.tests/src/org/eclipse/gmt/modisco/xml/discoverer/tests/Test002.java b/org.eclipse.gmt.modisco.xml.discoverer.tests/src/org/eclipse/gmt/modisco/xml/discoverer/tests/Test002.java
index 4b0d4b5..1dde4d1 100644
--- a/org.eclipse.gmt.modisco.xml.discoverer.tests/src/org/eclipse/gmt/modisco/xml/discoverer/tests/Test002.java
+++ b/org.eclipse.gmt.modisco.xml.discoverer.tests/src/org/eclipse/gmt/modisco/xml/discoverer/tests/Test002.java
@@ -44,8 +44,9 @@
 

 /**

  * Basic test of discovering a XML model and testing root, attributes

- * 

+ * @deprecated cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470885

  */

+@Deprecated

 public class Test002 {

 	private static final int MAGIC_NUMBER = 3;

 	private static final String TEST2_XML = "Test002.xml"; //$NON-NLS-1$

diff --git a/org.eclipse.gmt.modisco.xml.discoverer/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.xml.discoverer/META-INF/MANIFEST.MF
index d7eac5e..9dac1f1 100644
--- a/org.eclipse.gmt.modisco.xml.discoverer/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.xml.discoverer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.gmt.modisco.xml.discoverer;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.gmt.modisco.xml.discoverer.XmlActivator
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.gmt.modisco.xml.discoverer/OSGI-INF/l10n/bundle.properties b/org.eclipse.gmt.modisco.xml.discoverer/OSGI-INF/l10n/bundle.properties
index bd84baf..95f45b9 100644
--- a/org.eclipse.gmt.modisco.xml.discoverer/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.gmt.modisco.xml.discoverer/OSGI-INF/l10n/bundle.properties
@@ -10,6 +10,6 @@
 ###############################################################################

 

 #Properties file for org.eclipse.gmt.modisco.xml.discoverer

-pluginName = MoDisco Generic XML Discoverer (Incubation)

+pluginName = MoDisco Generic XML Discoverer (Deprecated) (Incubation)

 providerName = Eclipse Modeling Project

-discoverer.name = Discover generic XML model

+discoverer.name = Discover generic XML model (Deprecated)

diff --git a/org.eclipse.gmt.modisco.xml.discoverer/src/org/eclipse/gmt/modisco/xml/discoverer/XmlActivator.java b/org.eclipse.gmt.modisco.xml.discoverer/src/org/eclipse/gmt/modisco/xml/discoverer/XmlActivator.java
index 7916150..09e8080 100644
--- a/org.eclipse.gmt.modisco.xml.discoverer/src/org/eclipse/gmt/modisco/xml/discoverer/XmlActivator.java
+++ b/org.eclipse.gmt.modisco.xml.discoverer/src/org/eclipse/gmt/modisco/xml/discoverer/XmlActivator.java
@@ -16,7 +16,10 @@
 

 /**

  * The activator class controls the plug-in life cycle

+ * replaced by org.eclipse.modisco.xml.discoverer.XMLModelDiscoverer,

+ * @deprecated cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470885

  */

+@Deprecated

 public class XmlActivator extends Plugin {

 

 	// The plug-in ID

diff --git a/org.eclipse.gmt.modisco.xml.discoverer/src/org/eclipse/gmt/modisco/xml/discoverer/actions/XMLModelDiscoverer.java b/org.eclipse.gmt.modisco.xml.discoverer/src/org/eclipse/gmt/modisco/xml/discoverer/actions/XMLModelDiscoverer.java
index 435cd6f..995adbf 100644
--- a/org.eclipse.gmt.modisco.xml.discoverer/src/org/eclipse/gmt/modisco/xml/discoverer/actions/XMLModelDiscoverer.java
+++ b/org.eclipse.gmt.modisco.xml.discoverer/src/org/eclipse/gmt/modisco/xml/discoverer/actions/XMLModelDiscoverer.java
@@ -37,7 +37,8 @@
 /**

  * Discover generic XML model action.

  * 

- * @deprecated use {@link XMLModelDiscoverer2} instead

+ * @deprecated replaced by org.eclipse.modisco.xml.discoverer.XMLModelDiscoverer,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470885

  */

 @Deprecated

 public class XMLModelDiscoverer implements Discoverer {

diff --git a/org.eclipse.gmt.modisco.xml/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.xml/META-INF/MANIFEST.MF
index bd5c1d1..40846da 100644
--- a/org.eclipse.gmt.modisco.xml/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.xml/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %pluginName

 Bundle-SymbolicName: org.eclipse.gmt.modisco.xml;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-ClassPath: .

 Bundle-Vendor: %providerName

 Bundle-Localization: plugin

diff --git a/org.eclipse.modisco.all.feature/feature.xml b/org.eclipse.modisco.all.feature/feature.xml
index d47a304..d6f26d9 100644
--- a/org.eclipse.modisco.all.feature/feature.xml
+++ b/org.eclipse.modisco.all.feature/feature.xml
@@ -12,7 +12,7 @@
 <feature

       id="org.eclipse.modisco.all.feature"

       label="MoDisco&apos;s quality analysis reports"

-      version="0.12.2.qualifier"

+      version="0.13.2.qualifier"

       provider-name="%providerName"

       license-feature="org.eclipse.license"

       license-feature-version="0.0.0">

diff --git a/org.eclipse.modisco.archi.tech.targetplatform/org.eclipse.modisco.archi.tech.targetplatform.target b/org.eclipse.modisco.archi.tech.targetplatform/org.eclipse.modisco.archi.tech.targetplatform.target
index c6f7ed8..9b34a28 100644
--- a/org.eclipse.modisco.archi.tech.targetplatform/org.eclipse.modisco.archi.tech.targetplatform.target
+++ b/org.eclipse.modisco.archi.tech.targetplatform/org.eclipse.modisco.archi.tech.targetplatform.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>

 <?pde version="3.6"?>

 

-<target name="org.eclipse.modisco.archi.tech.targetplatform" sequenceNumber="5">

+<target name="org.eclipse.modisco.archi.tech.targetplatform" sequenceNumber="6">

 <locations>

 <location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">

 <unit id="org.eclipse.m2m.atl.feature.group" version="3.1.0.v201006150240"/>

@@ -26,9 +26,9 @@
 <repository location="http://download.eclipse.org/technology/epp/packages/helios/"/>

 </location>

 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">

-<unit id="org.eclipse.emf.facet.sdk.feature.feature.group" version="0.4.0.201405190853"/>

-<unit id="org.eclipse.emf.facet.util.tests.feature.feature.group" version="0.4.0.201405190853"/>

-<repository location="http://download.eclipse.org/facet/updates/release/"/>

+<unit id="org.eclipse.emf.facet.sdk.feature.feature.group" version="0.0.0"/>

+<unit id="org.eclipse.emf.facet.util.tests.feature.feature.group" version="0.0.0"/>

+<repository location="http://archive.eclipse.org/facet/updates/release/1.0.2/"/>

 </location>

 <location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">

 <unit id="org.eclipse.swtbot.forms.feature.group" version="2.0.5.20111003_1754-3676ac8-dev-e36"/>

diff --git a/org.eclipse.modisco.common.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.common.tests/META-INF/MANIFEST.MF
index fb16382..70a0aea 100644
--- a/org.eclipse.modisco.common.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.common.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-SymbolicName: org.eclipse.modisco.common.tests;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.common.tests.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.common.tests/src/org/eclipse/modisco/common/tests/Activator.java b/org.eclipse.modisco.common.tests/src/org/eclipse/modisco/common/tests/Activator.java
index b4bbb14..29ecd43 100644
--- a/org.eclipse.modisco.common.tests/src/org/eclipse/modisco/common/tests/Activator.java
+++ b/org.eclipse.modisco.common.tests/src/org/eclipse/modisco/common/tests/Activator.java
@@ -15,7 +15,9 @@
 

 /**

  * The activator class controls the plug-in life cycle

+ * @deprecated Will become internal cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470609

  */

+@Deprecated

 public class Activator extends AbstractUIPlugin {

 

 	// The plug-in ID

diff --git a/org.eclipse.modisco.dev.doc/META-INF/MANIFEST.MF b/org.eclipse.modisco.dev.doc/META-INF/MANIFEST.MF
index c69d3ff..8216b12 100644
--- a/org.eclipse.modisco.dev.doc/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.dev.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %Bundle-Name

 Bundle-SymbolicName: org.eclipse.modisco.dev.doc;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-Vendor: %Bundle-Vendor

 Require-Bundle: org.eclipse.core.runtime

 Bundle-ActivationPolicy: lazy

diff --git a/org.eclipse.modisco.doc.api.report.eclipsepackage/org.eclipse.modisco.doc.api.report.eclipsepackage.product b/org.eclipse.modisco.doc.api.report.eclipsepackage/org.eclipse.modisco.doc.api.report.eclipsepackage.product
index b41f260..f95be03 100644
--- a/org.eclipse.modisco.doc.api.report.eclipsepackage/org.eclipse.modisco.doc.api.report.eclipsepackage.product
+++ b/org.eclipse.modisco.doc.api.report.eclipsepackage/org.eclipse.modisco.doc.api.report.eclipsepackage.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <?pde version="3.5"?>

 

-<product name="MoDisco API Use Report Package" uid="org.eclipse.modisco.doc.api.report.eclipsepackage" id="org.eclipse.sdk.ide" application="org.eclipse.ui.ide.workbench" useFeatures="true" includeLaunchers="true">

+<product name="MoDisco API Use Report Package" uid="org.eclipse.modisco.doc.api.report.eclipsepackage" id="org.eclipse.sdk.ide" application="org.eclipse.ui.ide.workbench" version="0.13.2" useFeatures="true" includeLaunchers="true">

 

    <configIni use="default">

    </configIni>

diff --git a/org.eclipse.modisco.doc.api.report/META-INF/MANIFEST.MF b/org.eclipse.modisco.doc.api.report/META-INF/MANIFEST.MF
index dee99f6..6821ac7 100644
--- a/org.eclipse.modisco.doc.api.report/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.doc.api.report/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: MoDisco API Report
+Bundle-Name: MoDisco API Report (Incubation)
 Bundle-SymbolicName: org.eclipse.modisco.doc.api.report;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Vendor: Eclipse Modling Project
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.modisco.doc.metric.report/.gitignore b/org.eclipse.modisco.doc.metric.report/.gitignore
new file mode 100644
index 0000000..d714bde
--- /dev/null
+++ b/org.eclipse.modisco.doc.metric.report/.gitignore
@@ -0,0 +1 @@
+/report
\ No newline at end of file
diff --git a/org.eclipse.modisco.doc.metric.report/META-INF/MANIFEST.MF b/org.eclipse.modisco.doc.metric.report/META-INF/MANIFEST.MF
index b9b4a17..8cce234 100644
--- a/org.eclipse.modisco.doc.metric.report/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.doc.metric.report/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Metrics Report
+Bundle-Name: MoDisco Metrics Report (Incubation)
 Bundle-SymbolicName: org.eclipse.modisco.doc.metric.report;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.modisco.doc.test.report/META-INF/MANIFEST.MF b/org.eclipse.modisco.doc.test.report/META-INF/MANIFEST.MF
index 640e99d..383100f 100644
--- a/org.eclipse.modisco.doc.test.report/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.doc.test.report/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: MoDisco Test Report
+Bundle-Name: MoDisco Test Report (Incubation)
 Bundle-SymbolicName: org.eclipse.modisco.doc.test.report;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Vendor: Eclipse Modeling Project
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.modisco.doc.test.report/pom.xsl b/org.eclipse.modisco.doc.test.report/pom.xsl
index 3b2c32b..79365a4 100644
--- a/org.eclipse.modisco.doc.test.report/pom.xsl
+++ b/org.eclipse.modisco.doc.test.report/pom.xsl
@@ -22,7 +22,7 @@
 				<dependency>

 					<groupId>org.eclipse.mdt</groupId>

 					<artifactId>org.eclipse.modisco.tests</artifactId>

-					<version>0.12.2-SNAPSHOT</version>

+					<version>0.13.2-SNAPSHOT</version>

 					<type>eclipse-test-plugin</type>

 				</dependency>

 			</dependencies>

diff --git a/org.eclipse.modisco.doc/META-INF/MANIFEST.MF b/org.eclipse.modisco.doc/META-INF/MANIFEST.MF
index da506b0..6927eaa 100644
--- a/org.eclipse.modisco.doc/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %Bundle-Name

 Bundle-SymbolicName: org.eclipse.modisco.doc;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-Activator: org.eclipse.modisco.doc.internal.Activator

 Bundle-Vendor: %Bundle-Vendor

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

diff --git a/org.eclipse.modisco.doc/javadoc/empty.txt b/org.eclipse.modisco.doc/javadoc/empty.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/org.eclipse.modisco.doc/javadoc/empty.txt
diff --git a/org.eclipse.modisco.doc/maintoc.xml b/org.eclipse.modisco.doc/maintoc.xml
index 1f7baf9..671b93d 100644
--- a/org.eclipse.modisco.doc/maintoc.xml
+++ b/org.eclipse.modisco.doc/maintoc.xml
@@ -1,35 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-Copyright (c) 2010 Mia-Software.

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

-    Fabien GIQUEL (Mia-Software) - initial API and implementation

--->

-<toc label="MoDisco Documentation">

-   <topic label="MoDisco User Guide">

-	   <topic label="Infrastructure">

-	      <anchor id="infrastructure.main"/>

-	      <anchor id="infrastructure.omg"/>

-	   </topic>

-	   <topic label="Technologies">

-	      <anchor id="technologies.anchor"/>

-	   </topic>

-	   <topic label="Usecases">

-	      <anchor id="usecases.anchor"/>

-	   </topic>

-	   <topic href="javadoc/index.html" label="API Reference"/>

-	   <topic href="mediawiki/new_and_noteworthy.html" label="New and Noteworthy"/>

-   </topic>

-   <topic label="Simultaneous Release Tracker Required Documents">

-		<anchor id="api.report"/>

-		<anchor id="test.report"/>

-		<anchor id="metric.report"/>

-   </topic>

-   <topic label="Architecture documentation">

-		<anchor id="archi"/>

-   </topic>

-</toc>

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (c) 2010, 2015 Mia-Software.
+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:
+    Fabien GIQUEL (Mia-Software) - initial API and implementation
+    Grégoire Dupé (Mia-Software) - Bug 479420 - Moving the API policy wiki page to git.
+-->
+<toc label="MoDisco Documentation">
+	<topic label="MoDisco User Guide">
+		<topic label="Infrastructure">
+			<anchor id="infrastructure.main"/>
+			<anchor id="infrastructure.omg"/>
+		</topic>
+		<topic label="Technologies">
+			<anchor id="technologies.anchor"/>
+		</topic>
+		<topic label="Usecases">
+			<anchor id="usecases.anchor"/>
+		</topic>
+		<topic href="javadoc/index.html" label="API Reference"/>
+		<topic href="mediawiki/new_and_noteworthy.html" label="New and Noteworthy"/>
+	</topic>
+	<topic label="Simultaneous Release Tracker Required Documents">
+		<topic href="mediawiki/API_policy.html" label="API Policy"/>
+		<anchor id="api.report"/>
+		<anchor id="test.report"/>
+		<anchor id="metric.report"/>
+	</topic>
+	<topic label="Architecture documentation">
+		<anchor id="archi"/>
+	</topic>
+</toc>
diff --git a/org.eclipse.modisco.doc/mediawiki/API_policy.mediawiki b/org.eclipse.modisco.doc/mediawiki/API_policy.mediawiki
new file mode 100644
index 0000000..c531182
--- /dev/null
+++ b/org.eclipse.modisco.doc/mediawiki/API_policy.mediawiki
@@ -0,0 +1,77 @@
+=API Policy=
+
+This policy defines rules which give some guarantees to adopters about the MoDisco API stability.
+
+We consider MoDisco API as the union of Java API, Eclipse Extension points, and also Models.
+
+Indeed, since the MoDisco project addresses Model-Driven Reverse Engineering, it proposes various metamodels definitions and conforming models to support the end-user use cases. 
+
+== Declared API  ==
+
+Declared API is public API that MoDisco has committed to supporting for several releases. It should be clean and contain adequate javadoc. Declared API may evolve in the first few milestones, but it must be frozen by the release API freeze date and will not change throughout the remainder of the release or the corresponding maintenance releases.
+
+In following releases, API may sometimes be deprecated due to the normal evolution of MoDisco. Deprecations must contain information on a migration path for existing adopters. Deprecated API may not be removed for at least 1 major release (and preferably longer), and after notifying the community.
+
+The user must not implement or extend the API generated by EMF.
+
+== Provisional API  ==
+
+Provisional API is a work in progress towards fully Declared API and can be used when committers want to gather community feedback before declaring API, or when there are known problems with a new API that cannot be addressed by API freeze date. Provisional API status is meant to be a temporary state and API should not remain provisional for an undue length of time.
+
+Provisional Java API should be marked at the class or member level with the following javadoc comment:
+<pre>/** Provisional API: This class/interface is part of an interim API
+* that is still under development and expected to
+* change before reaching stability.
+*/
+</pre>
+Provisional Model API should be marked at the ecore level with a metamodel identifier mentioning "incubation" (e.g. "http://www.eclipse.org/MoDisco/Java/0.2.incubation/java" as nsURI identifier of an ecore definition). Java model API, because it is generated from ecore model, shouldn't have to be marked as provisional accordingly to the ecore definition.
+
+Provisional Extension Point API should be marked as "incubation" in extension point naming.
+
+== Examples API  ==
+
+The project delivers some examples plugins for various MoDisco features. It includes some models conforming to MoDisco infrastructure and technologies layers, and some Java API. Those components might be used as a starting point for the end-user reverse engineering process. But Examples API is not as stable as declared API and is expected to change.
+
+Any resource included in a plugin whose name indicates 'examples' should be considered of Internal API kind.
+
+The examples APIs are not stable. They can change without any notice (including in a service release).
+
+== Test API  ==
+
+In addition the project delivers some tests plugins for various MoDisco features. It also includes some models and Java classes, which are not as stable as declared API.
+
+Any resource included in a plugin whose name indicates 'test' should be also considered of Internal API kind.
+
+== Internal Use  ==
+
+Internal code is everything else. MoDisco reserves the right to change internal code at any time (including in a service release).
+
+The internal packages should contain 'internal' in the package name
+The internal packages should not appear in "Exported Packages" in manifest file. ''Note : within MoDisco components, x-friends|x-internal can be used in the manifest to give 'internal' access to any plugin from the same layer that requires it, in such a case it is accurate to write a API.readme.txt file at the top level of the project to justify why one of its internal package is exposed.''
+
+Internal extension points should be indicated by 'internal' in the extension point name.
+
+Internal model API (rare) should be indicated by 'internal' in the identifier.
+
+If adopters require the use of internal code and do not want to be continually broken, they should open bugzilla enhancement requests for API. These bugs will be triaged and will help drive the creation of new declared or provisional API.
+
+== Deprecated API declaration ==
+
+When an API need to be declared deprecated, the contributor has to:
+* Add the @Deprecated tag in the Java code.
+* Open a bug:
+** having a summary starting with [Deprecated],
+** specifying in which version the API will be removed.
+* Copy the bug URL in the Java code of the deprecated API.
+* Add in the Javadoc comment using the @deprecated tag:
+** an explanation of what to do when we are using the deprecated API,
+** the version number of the deprecation,
+** the bug URL.
+
+<font size="-2">
+Copyright (c) 2015 Mia-Software.
+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.
+</font>
diff --git a/org.eclipse.modisco.eclipseplugin.discoverer.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.eclipseplugin.discoverer.ui/META-INF/MANIFEST.MF
index 8a0fb83..166ce64 100644
--- a/org.eclipse.modisco.eclipseplugin.discoverer.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.eclipseplugin.discoverer.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.eclipseplugin.discoverer.ui;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.eclipseplugin.discoverer.ui.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.modisco.eclipseplugin.discoverer/META-INF/MANIFEST.MF b/org.eclipse.modisco.eclipseplugin.discoverer/META-INF/MANIFEST.MF
index 4f29a52..d304a64 100644
--- a/org.eclipse.modisco.eclipseplugin.discoverer/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.eclipseplugin.discoverer/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-SymbolicName: org.eclipse.modisco.eclipseplugin.discoverer;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.eclipseplugin.discoverer.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.eclipseplugin.discoverer/src/org/eclipse/modisco/eclipseplugin/discoverer/Activator.java b/org.eclipse.modisco.eclipseplugin.discoverer/src/org/eclipse/modisco/eclipseplugin/discoverer/Activator.java
index 657b63b..d302c8f 100644
--- a/org.eclipse.modisco.eclipseplugin.discoverer/src/org/eclipse/modisco/eclipseplugin/discoverer/Activator.java
+++ b/org.eclipse.modisco.eclipseplugin.discoverer/src/org/eclipse/modisco/eclipseplugin/discoverer/Activator.java
@@ -15,7 +15,9 @@
 

 /**

  * The activator class controls the plug-in life cycle

+ * @deprecated Will become internal cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470609

  */

+@Deprecated

 public class Activator extends AbstractUIPlugin {

 

 	// The plug-in ID

diff --git a/org.eclipse.modisco.eclipseplugin.discoverer/src/org/eclipse/modisco/eclipseplugin/discoverer/DiscoverEclipsePluginFromJavaProject.java b/org.eclipse.modisco.eclipseplugin.discoverer/src/org/eclipse/modisco/eclipseplugin/discoverer/DiscoverEclipsePluginFromJavaProject.java
index aedda0f..f290076 100644
--- a/org.eclipse.modisco.eclipseplugin.discoverer/src/org/eclipse/modisco/eclipseplugin/discoverer/DiscoverEclipsePluginFromJavaProject.java
+++ b/org.eclipse.modisco.eclipseplugin.discoverer/src/org/eclipse/modisco/eclipseplugin/discoverer/DiscoverEclipsePluginFromJavaProject.java
@@ -53,7 +53,8 @@
 import org.eclipse.modisco.properties.discoverer.PropertiesModelDiscoverer;

 

 /**

- * @deprecated use {@link DiscoverEclipsePluginFromJavaProject2}

+ * @deprecated use {@link DiscoverEclipsePluginFromJavaProject2}, cf

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=472760

  */

 @Deprecated

 public class DiscoverEclipsePluginFromJavaProject implements Discoverer {

diff --git a/org.eclipse.modisco.eclipseplugin/META-INF/MANIFEST.MF b/org.eclipse.modisco.eclipseplugin/META-INF/MANIFEST.MF
index e85afa0..0baec51 100644
--- a/org.eclipse.modisco.eclipseplugin/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.eclipseplugin/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %pluginName

 Bundle-SymbolicName: org.eclipse.modisco.eclipseplugin;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-ClassPath: .

 Bundle-Vendor: %providerName

 Bundle-Localization: plugin

diff --git a/org.eclipse.modisco.examples.feature/feature.xml b/org.eclipse.modisco.examples.feature/feature.xml
index d633d24..8c5b0d0 100644
--- a/org.eclipse.modisco.examples.feature/feature.xml
+++ b/org.eclipse.modisco.examples.feature/feature.xml
@@ -12,7 +12,7 @@
 <feature

       id="org.eclipse.modisco.examples.feature"

       label="MoDisco Examples (Incubation)"

-      version="0.12.2.qualifier"

+      version="0.13.2.qualifier"

       provider-name="%providerName"

       plugin="org.eclipse.gmt.modisco.examples"

       license-feature="org.eclipse.license"

diff --git a/org.eclipse.modisco.infra.browser.custom.examples.generation/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.browser.custom.examples.generation/META-INF/MANIFEST.MF
index 3b8c900..f2c7b7e 100644
--- a/org.eclipse.modisco.infra.browser.custom.examples.generation/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.infra.browser.custom.examples.generation/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.infra.browser.custom.examples.generation;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.infra.browser.custom.examples.generation.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.infra.browser.custom.examples.java.jdk.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.browser.custom.examples.java.jdk.tests/META-INF/MANIFEST.MF
index ffc3ecb..426b2d4 100644
--- a/org.eclipse.modisco.infra.browser.custom.examples.java.jdk.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.infra.browser.custom.examples.java.jdk.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.infra.browser.custom.examples.java.jdk.tests
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.infra.browser.custom.examples.java.jdk.tests.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.modisco.infra.browser.custom.examples.java.jdk.tests/src/org/eclipse/modisco/infra/browser/custom/examples/java/jdk/tests/Activator.java b/org.eclipse.modisco.infra.browser.custom.examples.java.jdk.tests/src/org/eclipse/modisco/infra/browser/custom/examples/java/jdk/tests/Activator.java
index 35d62f5..fe4193d 100644
--- a/org.eclipse.modisco.infra.browser.custom.examples.java.jdk.tests/src/org/eclipse/modisco/infra/browser/custom/examples/java/jdk/tests/Activator.java
+++ b/org.eclipse.modisco.infra.browser.custom.examples.java.jdk.tests/src/org/eclipse/modisco/infra/browser/custom/examples/java/jdk/tests/Activator.java
@@ -15,7 +15,9 @@
 

 /**

  * The activator class controls the plug-in life cycle

+ * @deprecated Will become internal cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470609

  */

+@Deprecated

 public class Activator extends AbstractUIPlugin {

 

 	// The plug-in ID

diff --git a/org.eclipse.modisco.infra.browser.custom.examples.uml.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.browser.custom.examples.uml.tests/META-INF/MANIFEST.MF
index a392dfa..49d45bb 100644
--- a/org.eclipse.modisco.infra.browser.custom.examples.uml.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.infra.browser.custom.examples.uml.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-SymbolicName: org.eclipse.modisco.infra.browser.custom.examples.uml.tests
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.infra.browser.custom.examples.uml.tests.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.infra.browser.custom.examples.uml.tests/src/org/eclipse/modisco/infra/browser/custom/examples/uml/tests/Activator.java b/org.eclipse.modisco.infra.browser.custom.examples.uml.tests/src/org/eclipse/modisco/infra/browser/custom/examples/uml/tests/Activator.java
index 2c19dee..6bd1a0f 100644
--- a/org.eclipse.modisco.infra.browser.custom.examples.uml.tests/src/org/eclipse/modisco/infra/browser/custom/examples/uml/tests/Activator.java
+++ b/org.eclipse.modisco.infra.browser.custom.examples.uml.tests/src/org/eclipse/modisco/infra/browser/custom/examples/uml/tests/Activator.java
@@ -15,7 +15,9 @@
 

 /**

  * The activator class controls the plug-in life cycle

+ * @deprecated Will become internal cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470609

  */

+@Deprecated

 public class Activator extends AbstractUIPlugin {

 

 	// The plug-in ID

diff --git a/org.eclipse.modisco.infra.browser.custom.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.browser.custom.tests/META-INF/MANIFEST.MF
index 9e40d43..f422986 100644
--- a/org.eclipse.modisco.infra.browser.custom.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.infra.browser.custom.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Name: %Bundle-Name

 Bundle-Vendor: %Bundle-Vendor

 Bundle-SymbolicName: org.eclipse.modisco.infra.browser.custom.tests;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Require-Bundle: org.junit;bundle-version="4.7.0",

  org.eclipse.gmt.modisco.infra.common.core;bundle-version="0.7.0",

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

diff --git a/org.eclipse.modisco.infra.browser.custom.tests/src/org/eclipse/modisco/infra/browser/custom/tests/Activator.java b/org.eclipse.modisco.infra.browser.custom.tests/src/org/eclipse/modisco/infra/browser/custom/tests/Activator.java
index 713425c..d77274c 100644
--- a/org.eclipse.modisco.infra.browser.custom.tests/src/org/eclipse/modisco/infra/browser/custom/tests/Activator.java
+++ b/org.eclipse.modisco.infra.browser.custom.tests/src/org/eclipse/modisco/infra/browser/custom/tests/Activator.java
@@ -16,7 +16,9 @@
 /**

  * 

  * @author Gregoire DUPE (Mia-Software)

+ * @deprecated Will become internal cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470609

  */

+@Deprecated

 public class Activator extends Plugin {

 

 	private static Activator plugin;

diff --git a/org.eclipse.modisco.infra.browser.ecore.core/.checkstyle b/org.eclipse.modisco.infra.browser.ecore.core/.checkstyle
new file mode 100644
index 0000000..e25b712
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.core/.checkstyle
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+Copyright (c) 2010 Mia-Software.

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

+    Nicolas Bros (Mia-Software) - initial API and implementation

+-->

+<fileset-config file-format-version="1.2.0" simple-config="true">

+  <local-check-config name="EmfFacet" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>

+  <fileset name="all" enabled="true" check-config-name="EmfFacet" local="true">

+    <file-match-pattern match-pattern="." include-pattern="true"/>

+    <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>

+    <!-- cf. comments in the file -->

+    <file-match-pattern match-pattern="AggregatePackage.java" include-pattern="false"/>

+  </fileset>

+</fileset-config>

diff --git a/org.eclipse.modisco.infra.browser.ecore.core/.classpath b/org.eclipse.modisco.infra.browser.ecore.core/.classpath
new file mode 100644
index 0000000..2d1a430
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.core/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<classpath>

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

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

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

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

+</classpath>

diff --git a/org.eclipse.modisco.infra.browser.ecore.core/.pmd b/org.eclipse.modisco.infra.browser.ecore.core/.pmd
new file mode 100644
index 0000000..a64878b
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.core/.pmd
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<pmd>

+    <useProjectRuleSet>true</useProjectRuleSet>

+    <ruleSetFile>../org.eclipse.emf.facet.archi.tech.rules/pmd/ruleset.xml</ruleSetFile>

+    <includeDerivedFiles>false</includeDerivedFiles>

+    <violationsAsErrors>true</violationsAsErrors>

+</pmd>

diff --git a/org.eclipse.modisco.infra.browser.ecore.core/.project b/org.eclipse.modisco.infra.browser.ecore.core/.project
new file mode 100644
index 0000000..0414e34
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.core/.project
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.modisco.infra.browser.ecore.core</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>

+		<buildCommand>

+			<name>net.sourceforge.pmd.eclipse.plugin.pmdBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

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

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

+		<nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature>

+		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>

+	</natures>

+</projectDescription>

diff --git a/org.eclipse.modisco.infra.browser.ecore.core/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.browser.ecore.core/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..d501111
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.core/META-INF/MANIFEST.MF
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: MoDisco Browser Ecore Core (Incubation)
+Bundle-SymbolicName: org.eclipse.modisco.infra.browser.ecore.core;singleton:=true
+Bundle-Version: 0.13.2.qualifier
+Bundle-Activator: org.eclipse.modisco.infra.browser.ecore.core.internal.Activator
+Bundle-Vendor: Eclipse Modeling Project
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.emf.facet.query.java.core;bundle-version="0.5.0",
+ org.eclipse.emf.ecore;bundle-version="2.6.0",
+ org.eclipse.emf.facet.efacet.metamodel;bundle-version="0.4.0"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.modisco.infra.browser.ecore.core/about.html b/org.eclipse.modisco.infra.browser.ecore.core/about.html
new file mode 100644
index 0000000..dfb76ea
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.core/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

+<title>About</title>

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>August 25, 2014</p>	

+<h3>License</h3>

+

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

+indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

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

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

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

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

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

+

+</body>

+</html>
\ No newline at end of file
diff --git a/org.eclipse.modisco.infra.browser.ecore.core/build.properties b/org.eclipse.modisco.infra.browser.ecore.core/build.properties
new file mode 100644
index 0000000..e79bb21
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.core/build.properties
@@ -0,0 +1,8 @@
+source.. = src/

+output.. = bin/

+bin.includes = META-INF/,\

+               .,\

+               plugin.xml,\

+               about.html,\

+               custom/

+src.includes = about.html

diff --git a/org.eclipse.modisco.infra.browser.ecore.core/custom/ePackageContainsEClass.custom b/org.eclipse.modisco.infra.browser.ecore.core/custom/ePackageContainsEClass.custom
new file mode 100644
index 0000000..7da21f9
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.core/custom/ePackageContainsEClass.custom
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="ASCII"?>

+<custom:Customization

+	xmi:version="2.0"

+	xmlns:xmi="http://www.omg.org/XMI"

+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+	xmlns:custom="http://www.eclipse.org/emf/facet/custom/0.2.incubation/custom"

+	xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

+	xmlns:efacet="http://www.eclipse.org/emf/facet/efacet/0.2.incubation/efacet"

+	xmlns:javaQuery="http://www.eclipse.org/emf/facet/query/java/0.2.incubation/javaquery"

+	name="org.eclipse.modisco.infra.browser.ecore.core.ePackageContainsEClass"

+	nsURI="http://www.eclipse.org/MoDisco/infra/browser/ecore/0.13.0.incubation/ePackageContainsEClass/"

+	nsPrefix="ePackageContainsEClass">

+  <eClassifiers xsi:type="custom:EClassCustomization" name="EPackage null">

+    <extendedMetaclass href="http://www.eclipse.org/emf/2002/Ecore#//EPackage"/>

+    <facetOperations name="children" upperBound="-1">

+      <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EStructuralFeature"/>

+      <eParameters name="eStructuralFeature">

+        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//ETypedElement"/>

+      </eParameters>

+      <query xsi:type="custom:ETypedElementSwitchQuery">

+        <cases>

+          <value xsi:type="javaQuery:JavaQuery" implementationClassName="org.eclipse.modisco.infra.browser.ecore.core.internal.epackagecontainseclass.ChildrenQuery"/>

+        </cases>

+        <cases>

+          <case xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/2002/Ecore#//EModelElement/eAnnotations"/>

+        </cases>

+        <cases>

+          <case xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//ENamedElement/name"/>

+        </cases>

+        <cases>

+          <case xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage/nsURI"/>

+        </cases>

+        <cases>

+          <case xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage/nsPrefix"/>

+        </cases>

+        <cases>

+          <case xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage/eFactoryInstance"/>

+        </cases>

+        <cases>

+          <case xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage/eClassifiers"/>

+        </cases>

+        <cases>

+          <case xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage/eSubpackages"/>

+        </cases>

+        <cases>

+          <case xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage/eSuperPackage"/>

+        </cases>

+      </query>

+      <override xsi:type="efacet:FacetOperation" href="../../../plugin/org.eclipse.emf.facet.custom.ui/resources/customproperties.efacet#//CustomizedEObject/children"/>

+    </facetOperations>

+    <extendedFacets href="../../../plugin/org.eclipse.emf.facet.custom.ui/resources/customproperties.efacet#//CustomizedEObject"/>

+  </eClassifiers>

+</custom:Customization>

diff --git a/org.eclipse.modisco.infra.browser.ecore.core/custom/hideDerivedReferences.custom b/org.eclipse.modisco.infra.browser.ecore.core/custom/hideDerivedReferences.custom
new file mode 100644
index 0000000..d8c4b38
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.core/custom/hideDerivedReferences.custom
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="ASCII"?>

+<custom:Customization

+	xmi:version="2.0"

+	xmlns:xmi="http://www.omg.org/XMI"

+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+	xmlns:custom="http://www.eclipse.org/emf/facet/custom/0.2.incubation/custom"

+	xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

+	xmlns:efacet="http://www.eclipse.org/emf/facet/efacet/0.2.incubation/efacet"

+	xmlns:javaQuery="http://www.eclipse.org/emf/facet/query/java/0.2.incubation/javaquery"

+	name="org.eclipse.modisco.infra.browser.ecore.core.hideDerivedReferences"

+	nsURI="http://www.eclipse.org/MoDisco/infra/browser/ecore/0.13.0.incubation/hideDerviedReferences/"

+	nsPrefix="hideDerviedReferences">

+  <eClassifiers xsi:type="custom:EClassCustomization" name="EReference null">

+    <extendedMetaclass href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

+    <facetOperations name="isVisible">

+      <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+      <eParameters name="eStructuralFeature">

+        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//ETypedElement"/>

+      </eParameters>

+      <query xsi:type="javaQuery:JavaQuery" implementationClassName="org.eclipse.modisco.infra.browser.ecore.core.internal.hidederviedreferences.IsVisibleQuery"/>

+      <override xsi:type="efacet:FacetOperation" href="../../../plugin/org.eclipse.emf.facet.custom.ui/resources/customproperties.efacet#//CustomizedEObject/isVisible"/>

+    </facetOperations>

+    <extendedFacets href="../../../plugin/org.eclipse.emf.facet.custom.ui/resources/customproperties.efacet#//CustomizedEObject"/>

+  </eClassifiers>

+</custom:Customization>

diff --git a/org.eclipse.modisco.infra.browser.ecore.core/custom/linksCount.custom b/org.eclipse.modisco.infra.browser.ecore.core/custom/linksCount.custom
new file mode 100644
index 0000000..0e4decd
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.core/custom/linksCount.custom
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="ASCII"?>

+<custom:Customization xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:custom="http://www.eclipse.org/emf/facet/custom/0.2.incubation/custom" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:efacet="http://www.eclipse.org/emf/facet/efacet/0.2.incubation/efacet" xmlns:javaQuery="http://www.eclipse.org/emf/facet/query/java/0.2.incubation/javaquery" name="org.eclipse.modisco.infra.browser.ecore.core.linksCount" nsURI="http://www.eclipse.org/MoDisco/infra/browser/ecore/0.13.0.incubation/linksCount" nsPrefix="linksCount">

+  <eClassifiers xsi:type="custom:EClassCustomization" name="EObject null">

+    <extendedMetaclass href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

+    <facetOperations name="label" lowerBound="1">

+      <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>

+      <eParameters name="eStructuralFeature">

+        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//ETypedElement"/>

+      </eParameters>

+          <query xsi:type="javaQuery:JavaQuery" implementationClassName="org.eclipse.modisco.infra.browser.ecore.core.internal.linkscount.LinksCountQuery"/>

+      <override xsi:type="efacet:FacetOperation" href="../../../plugin/org.eclipse.emf.facet.custom.ui/resources/customproperties.efacet#//CustomizedEObject/label"/>

+    </facetOperations>

+    <extendedFacets href="../../../plugin/org.eclipse.emf.facet.custom.ui/resources/customproperties.efacet#//CustomizedEObject"/>

+  </eClassifiers>

+</custom:Customization>

diff --git a/org.eclipse.modisco.infra.browser.ecore.core/plugin.xml b/org.eclipse.modisco.infra.browser.ecore.core/plugin.xml
new file mode 100644
index 0000000..857603b
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.core/plugin.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>

+<?eclipse version="3.4"?><!--
+Copyright (c) 2014 Mia-Software.
+

+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:
+   Gregoire Dupe (Mia-Software) - Bug 358914 - [Move to EMF Facet][Browser] Switch to EMF Facet
+-->

+<plugin>

+   <extension point="org.eclipse.emf.facet.util.emf.core.modeldeclaration">

+      <modeldeclaration file="custom/hideDerivedReferences.custom"/>

+      <modeldeclaration

+            file="custom/ePackageContainsEClass.custom">

+      </modeldeclaration>

+      <modeldeclaration

+            file="custom/linksCount.custom">

+      </modeldeclaration>

+   </extension>

+</plugin>

diff --git a/org.eclipse.modisco.infra.browser.ecore.core/src/org/eclipse/modisco/infra/browser/ecore/core/internal/Activator.java b/org.eclipse.modisco.infra.browser.ecore.core/src/org/eclipse/modisco/infra/browser/ecore/core/internal/Activator.java
new file mode 100644
index 0000000..6c26aff
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.core/src/org/eclipse/modisco/infra/browser/ecore/core/internal/Activator.java
@@ -0,0 +1,50 @@
+/** 

+ * Copyright (c) 2014 Mia-Software.

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

+ *    Gregoire Dupe (Mia-Software) - Bug 358914 - [Move to EMF Facet][Browser] Switch to EMF Facet

+ */

+package org.eclipse.modisco.infra.browser.ecore.core.internal;

+

+import org.eclipse.core.runtime.Plugin;

+import org.osgi.framework.BundleContext;

+

+@SuppressWarnings("PMD.UseSingleton")

+// @SuppressWarnings("PMD.UseSingleton") We cannot conforms to this rule because

+// this class is an Eclipse plug-in activator which will be instantiated by the

+// Eclipse framework.

+public class Activator extends Plugin {

+

+	private static Activator plugin;

+

+	@Override

+	@SuppressWarnings("PMD.SignatureDeclareThrowsException")

+	// @SuppressWarnings("PMD.SignatureDeclareThrowsException") We have to use

+	// this signature because this is an override of an Eclipse framework's

+	// method.

+	public void start(final BundleContext bundleContext) throws Exception {

+		super.start(bundleContext);

+		Activator.plugin = this;

+	}

+

+	@Override

+	@SuppressWarnings("PMD.SignatureDeclareThrowsException")

+	// @SuppressWarnings("PMD.SignatureDeclareThrowsException") We have to use

+	// this signature because this is an override of an Eclipse framework's

+	// method.

+	public void stop(final BundleContext bundleContext) throws Exception {

+		// NOPMD: PMD say "Assigning an Object to null is a code smell."

+		// No choice to right it in another way : this is an Eclipse pattern.

+		Activator.plugin = null; // NOPMD by gdupe on 30/03/12 10:19

+		super.stop(bundleContext);

+	}

+

+	public static Plugin getDefault() {

+		return Activator.plugin;

+	}

+

+}

diff --git a/org.eclipse.modisco.infra.browser.ecore.core/src/org/eclipse/modisco/infra/browser/ecore/core/internal/epackagecontainseclass/ChildrenQuery.java b/org.eclipse.modisco.infra.browser.ecore.core/src/org/eclipse/modisco/infra/browser/ecore/core/internal/epackagecontainseclass/ChildrenQuery.java
new file mode 100644
index 0000000..657f23b
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.core/src/org/eclipse/modisco/infra/browser/ecore/core/internal/epackagecontainseclass/ChildrenQuery.java
@@ -0,0 +1,33 @@
+/** 
+ * Copyright (c) 2014 Mia-Software.
+ * 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:
+ *    Gregoire Dupe (Mia-Software) - Bug 358914 - [Move to EMF Facet][Browser] Switch to EMF Facet
+ */
+package org.eclipse.modisco.infra.browser.ecore.core.internal.epackagecontainseclass;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.facet.efacet.core.IFacetManager;
+import org.eclipse.emf.facet.efacet.core.exception.DerivedTypedElementException;
+import org.eclipse.emf.facet.query.java.core.IJavaQuery2;
+import org.eclipse.emf.facet.query.java.core.IParameterValueList2;
+
+public class ChildrenQuery implements IJavaQuery2<EPackage, List<EStructuralFeature>> {
+	public List<EStructuralFeature> evaluate(final EPackage context, 
+			final IParameterValueList2 parameterValues,
+			final IFacetManager facetManager)
+			throws DerivedTypedElementException {
+		final List<EStructuralFeature> result = new ArrayList<EStructuralFeature>();
+		result.add(EcorePackage.eINSTANCE.getEPackage_EClassifiers());
+		return result;
+	}
+}
diff --git a/org.eclipse.modisco.infra.browser.ecore.core/src/org/eclipse/modisco/infra/browser/ecore/core/internal/hidederviedreferences/IsVisibleQuery.java b/org.eclipse.modisco.infra.browser.ecore.core/src/org/eclipse/modisco/infra/browser/ecore/core/internal/hidederviedreferences/IsVisibleQuery.java
new file mode 100644
index 0000000..558b233
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.core/src/org/eclipse/modisco/infra/browser/ecore/core/internal/hidederviedreferences/IsVisibleQuery.java
@@ -0,0 +1,40 @@
+/** 
+ * Copyright (c) 2014 Mia-Software.
+ * 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:
+ *    Gregoire Dupe (Mia-Software) - Bug 358914 - [Move to EMF Facet][Browser] Switch to EMF Facet
+ */
+package org.eclipse.modisco.infra.browser.ecore.core.internal.hidederviedreferences;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.facet.efacet.core.IFacetManager;
+import org.eclipse.emf.facet.efacet.core.exception.DerivedTypedElementException;
+import org.eclipse.emf.facet.query.java.core.IJavaQuery2;
+import org.eclipse.emf.facet.query.java.core.IParameterValueList2;
+
+public class IsVisibleQuery implements IJavaQuery2<EObject, Boolean> {
+	public Boolean evaluate(final EObject context, 
+			final IParameterValueList2 parameterValues,
+			final IFacetManager facetManager)
+			throws DerivedTypedElementException {
+		boolean result = false;
+		if (parameterValues.size() == 0) {
+			result = true;
+		} else {
+			final Object paramValue = parameterValues.get(0).getValue();
+			if (paramValue instanceof EStructuralFeature) {
+				final EStructuralFeature eStructFeature = (EStructuralFeature) paramValue;
+				result = !eStructFeature.isDerived();
+			} else {
+				throw new DerivedTypedElementException(
+						"Unexpected parameter type"); //$NON-NLS-1$
+			}
+		}
+		return  Boolean.valueOf(result);
+	}
+}
diff --git a/org.eclipse.modisco.infra.browser.ecore.core/src/org/eclipse/modisco/infra/browser/ecore/core/internal/linkscount/LinksCountQuery.java b/org.eclipse.modisco.infra.browser.ecore.core/src/org/eclipse/modisco/infra/browser/ecore/core/internal/linkscount/LinksCountQuery.java
new file mode 100644
index 0000000..fd892fe
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.core/src/org/eclipse/modisco/infra/browser/ecore/core/internal/linkscount/LinksCountQuery.java
@@ -0,0 +1,70 @@
+/** 

+ * Copyright (c) 2014 Soft-Maint.

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

+ *    Thomas Cicognani (Soft-Maint) - Bug 442017 - A customization counting elements by reference

+ */

+package org.eclipse.modisco.infra.browser.ecore.core.internal.linkscount;

+

+

+public class LinksCountQuery {

+	//FIXME

+}

+/*

+import java.util.Collection;

+

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

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

+import org.eclipse.emf.ecore.ETypedElement;

+import org.eclipse.emf.facet.efacet.core.IFacetManager;

+import org.eclipse.emf.facet.efacet.core.exception.DerivedTypedElementException;

+import org.eclipse.emf.facet.efacet.core.exception.FacetManagerException;

+import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.DerivedTypedElement;

+import org.eclipse.emf.facet.query.java.core.IJavaQuery3;

+import org.eclipse.emf.facet.query.java.core.IParameterValueList2;

+

+public class LinksCountQuery implements IJavaQuery3<EObject, String> {

+	public String evaluate(final EObject source,

+			final IParameterValueList2 parameterValues,

+			final IFacetManager facetManager, final DerivedTypedElement feature)

+			throws DerivedTypedElementException {

+		try {

+			String size = ""; //$NON-NLS-1$

+			if (parameterValues != null) {

+				final ETypedElement sfParam = (ETypedElement) parameterValues

+						.getParameterValueByName("eStructuralFeature").getValue(); //$NON-NLS-1$

+				if (sfParam instanceof EReference) {

+					size = getSizeForReference(source, facetManager, sfParam);

+				}

+			}

+			return facetManager.getSuperValueOf(feature, source,

+					parameterValues, String.class) + size;

+		} catch (FacetManagerException e) {

+			throw new DerivedTypedElementException(e);

+		}

+	}

+

+	private static String getSizeForReference(final EObject source,

+			final IFacetManager facetManager, final ETypedElement sfParam)

+			throws FacetManagerException {

+		String size = ""; //$NON-NLS-1$

+		final Object object = facetManager.getOrInvoke(source, sfParam,

+				Object.class);

+		if (object instanceof Collection) {

+			final Collection<?> collection = (Collection<?>) object;

+			final int listSize = collection.size();

+			if (listSize > 0) {

+				size = String.format(" (%d)", //$NON-NLS-1$

+						Integer.valueOf(listSize));

+			}

+		} else if (object != null) {

+			size = " (1)"; //$NON-NLS-1$

+		}

+		return size;

+	}

+}

+*/

diff --git a/org.eclipse.modisco.infra.browser.editor.ui/.checkstyle b/org.eclipse.modisco.infra.browser.editor.ui/.checkstyle
new file mode 100644
index 0000000..0394152
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.editor.ui/.checkstyle
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (c) 2010 Mia-Software.
+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:
+    Nicolas Bros (Mia-Software) - initial API and implementation
+-->
+<fileset-config file-format-version="1.2.0" simple-config="true">
+  <local-check-config name="EmfFacet" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <fileset name="all" enabled="true" check-config-name="EmfFacet" local="true">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+    <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
+    <!-- cf. comments in the file -->
+    <file-match-pattern match-pattern="AggregatePackage.java" include-pattern="false"/>
+  </fileset>
+</fileset-config>
diff --git a/org.eclipse.modisco.infra.browser.editor.ui/.classpath b/org.eclipse.modisco.infra.browser.editor.ui/.classpath
new file mode 100644
index 0000000..2d1a430
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.editor.ui/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<classpath>

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

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

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

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

+</classpath>

diff --git a/org.eclipse.modisco.infra.browser.editor.ui/.pmd b/org.eclipse.modisco.infra.browser.editor.ui/.pmd
new file mode 100644
index 0000000..efcd2db
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.editor.ui/.pmd
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<pmd>
+    <useProjectRuleSet>true</useProjectRuleSet>
+    <ruleSetFile>../org.eclipse.emf.facet.archi.tech.rules/pmd/ruleset.xml</ruleSetFile>
+    <includeDerivedFiles>false</includeDerivedFiles>
+    <violationsAsErrors>true</violationsAsErrors>
+</pmd>
diff --git a/org.eclipse.modisco.infra.browser.editor.ui/.project b/org.eclipse.modisco.infra.browser.editor.ui/.project
new file mode 100644
index 0000000..d2f5fad
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.editor.ui/.project
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.modisco.infra.browser.editor.ui</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

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

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

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

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

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

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>net.sourceforge.pmd.eclipse.plugin.pmdBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

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

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

+		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>

+		<nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature>

+	</natures>

+</projectDescription>

diff --git a/org.eclipse.modisco.infra.browser.editor.ui/.settings/org.eclipse.core.resources.prefs b/org.eclipse.modisco.infra.browser.editor.ui/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..4824b80
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.editor.ui/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1

+encoding/<project>=UTF-8

diff --git a/org.eclipse.modisco.infra.browser.editor.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.modisco.infra.browser.editor.ui/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..44217f8
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.editor.ui/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1

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

+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

+org.eclipse.jdt.core.compiler.compliance=1.5

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

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

+org.eclipse.jdt.core.compiler.source=1.5

diff --git a/org.eclipse.modisco.infra.browser.editor.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.browser.editor.ui/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..93c6664
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.editor.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,19 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: org.eclipse.modisco.infra.browser.editor.ui;singleton:=true
+Bundle-Version: 0.13.2.qualifier
+Bundle-Activator: org.eclipse.modisco.infra.browser.editor.ui.internal.Activator
+Bundle-Vendor: %Bundle-Vendor
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.emf.facet.custom.ui;bundle-version="0.3.0",
+ org.eclipse.emf.facet.custom.core;bundle-version="0.3.0",
+ org.eclipse.emf.ecore;bundle-version="2.6.0",
+ org.eclipse.ui.ide;bundle-version="3.6.0",
+ org.eclipse.core.resources;bundle-version="3.6.0",
+ org.eclipse.emf.facet.util.emf.ui;bundle-version="0.3.0",
+ org.eclipse.emf.facet.util.core;bundle-version="0.3.0",
+ org.eclipse.emf.ecore.edit;bundle-version="2.6.0"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.modisco.infra.browser.editor.ui/OSGI-INF/l10n/bundle.properties b/org.eclipse.modisco.infra.browser.editor.ui/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000..3a8219c
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.editor.ui/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,22 @@
+# Copyright (c) 2014 Soft-Maint.

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

+#    Gregoire Dupe (Mia-Software) - Bug 358914 - [Move to EMF Facet][Browser] Switch to EMF Facet

+#    Thomas Cicognani (Soft-Maint) - Bug 442257 - New toolbar actions to (des)activate customizations

+#    Thomas Cicognani (Soft-Maint) - Bug 442718 - Implement copy action in the new MoDisco Browser

+#    Thomas Cicognani (Soft-Maint) - Bug 442714 - New toolbar action to show/hide eContainer link

+#    Grégoire Dupé (Mia-Software) - Bug 469263 - [Unit Test Failure] org.eclipse.modisco.tests.BundleTest.name

+#Properties file for org.eclipse.emf.facet.widgets.tree.ui.workbench

+Bundle-Vendor = Eclipse Modeling Project

+Bundle-Name = MoDisco Tree Widgets (Incubation)

+TreeResourceEditor = Tree Resource Editor

+modiscoBrowserToolbarLabel = MoDisco Browser

+LoadUnloadFacets = Load/Unload facets

+LoadUnloadCustoms = Load/Unload customizations

+ShowLinksLabel = Show number of links

+ShowEContainerLabel = Show eContainer link

+CopyLabel = Copy

diff --git a/org.eclipse.modisco.infra.browser.editor.ui/about.html b/org.eclipse.modisco.infra.browser.editor.ui/about.html
new file mode 100644
index 0000000..0dbd45b
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.editor.ui/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

+<title>About</title>

+</head>

+<body lang="EN-US">

+<h2>About This Content</h2>

+ 

+<p>September 30, 2009</p>	

+<h3>License</h3>

+

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

+indicated below, the Content is provided to you under the terms and conditions of the

+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

+

+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

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

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

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

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

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

+

+</body>

+</html>
\ No newline at end of file
diff --git a/org.eclipse.modisco.infra.browser.editor.ui/build.properties b/org.eclipse.modisco.infra.browser.editor.ui/build.properties
new file mode 100644
index 0000000..79a2c78
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.editor.ui/build.properties
@@ -0,0 +1,9 @@
+source.. = src/

+output.. = bin/

+bin.includes = META-INF/,\

+               .,\

+               plugin.xml,\

+               OSGI-INF/,\

+               about.html

+

+src.includes = about.html

diff --git a/org.eclipse.modisco.infra.browser.editor.ui/plugin.xml b/org.eclipse.modisco.infra.browser.editor.ui/plugin.xml
new file mode 100644
index 0000000..80c2fd5
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.editor.ui/plugin.xml
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<?eclipse version="3.4"?>

+<!--

+ Copyright (c) 2014, 2016 Mia-Software, and Soft-Maint.

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

+    Grégoire Dupé (Mia-Software) - Bug 358914 - [Move to EMF Facet][Browser] Switch to EMF Facet

+    Thomas Cicognani (Soft-Maint) - Bug 442019 - Toolbar actions disappear when focus is not on the browser

+    Thomas Cicognani (Soft-Maint) - Bug 442257 - New toolbar actions to (des)activate customizations

+    Thomas Cicognani (Soft-Maint) - Bug 442718 - Implement copy action in the new MoDisco Browser

+    Thomas Cicognani (Soft-Maint) - Bug 442714 - New toolbar action to show/hide eContainer link

+    Thomas Cicognani (Soft-Maint) - Bug 442800 - API to open new MoDisco Browser

+    Thomas Cicognani (Soft-Maint) - Bug 470962 - Add shortcuts to activate customs

+    Thomas Cicognani (Soft-Maint) - Bug 471597 - [New Browser] Add a customization to display subclasses from an EClass

+    Thomas Cicognani (Soft-Maint) - Bug 472041 - [New Browser] Add a customization counting instances by EClass in the same Resource

+    Grégoire Dupé (Mia-Software) - Bug 507622 - [New Browser] The copy handler hides handlers of other parts
+-->

+<plugin>

+   <extension point="org.eclipse.ui.editors">

+      <editor

+            class="org.eclipse.modisco.infra.browser.editor.ui.internal.editor.TreeEditor"

+            default="false"

+            id="org.eclipse.modisco.infra.browser.editor.ui.TreeEditor"

+            name="%TreeResourceEditor">

+         <contentTypeBinding

+               contentTypeId="org.eclipse.emf.ecore.xmi">

+         </contentTypeBinding>

+      </editor>

+   </extension>

+   <extension

+         point="org.eclipse.emf.facet.util.emf.core.modelViewer">

+      <resourceViewer

+            class="org.eclipse.modisco.infra.browser.editor.ui.internal.opener.ResourceBrowserOpener">

+      </resourceViewer>

+   </extension>

+   <extension

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

+      <menuContribution

+            allPopups="false"

+            locationURI="toolbar:org.eclipse.ui.main.toolbar?after=additions">

+         <toolbar

+               id="org.eclipse.modisco.infra.browser.editor.ui.toolbar1"

+               label="%modiscoBrowserToolbarLabel">

+            <command

+                  commandId="org.eclipse.emf.facet.efacet.ui.loadFacet"

+                  id="org.eclipse.modisco.util.emffacet.menu.ui.loadFacet"

+                  label="%LoadUnloadFacets"

+                  style="pulldown">

+               <visibleWhen

+                     checkEnabled="true">

+                  <with

+                        variable="activeEditor">

+                     <instanceof

+                           value="org.eclipse.modisco.infra.browser.editor.ui.internal.editor.TreeEditor">

+                     </instanceof>

+                  </with>

+               </visibleWhen>

+            </command>

+            <command

+                  commandId="org.eclipse.modisco.infra.browser.editor.ui.command.facetset.econtainer"

+                  label="%ShowEContainerLabel"

+                  style="toggle">

+               <visibleWhen

+                     checkEnabled="true">

+                  <with

+                        variable="activeEditor">

+                     <instanceof

+                           value="org.eclipse.modisco.infra.browser.editor.ui.internal.editor.TreeEditor">

+                     </instanceof>

+                  </with>

+               </visibleWhen>

+            </command>

+            <command

+                  commandId="org.eclipse.emf.facet.ui.loadCustomization"

+                  id="org.eclipse.modisco.util.emffacet.ui.menu.loadCustomization"

+                  label="%LoadUnloadCustoms"

+                  style="pulldown">

+               <visibleWhen

+                     checkEnabled="true">

+                  <with

+                        variable="activeEditor">

+                     <instanceof

+                           value="org.eclipse.modisco.infra.browser.editor.ui.internal.editor.TreeEditor">

+                     </instanceof>

+                  </with>

+               </visibleWhen>

+            </command>

+            <command

+                  commandId="org.eclipse.modisco.infra.browser.editor.ui.command.linkscount"

+                  label="%ShowLinksLabel"

+                  style="toggle">

+               <visibleWhen

+                     checkEnabled="true">

+                  <with

+                        variable="activeEditor">

+                     <instanceof

+                           value="org.eclipse.modisco.infra.browser.editor.ui.internal.editor.TreeEditor">

+                     </instanceof>

+                  </with>

+               </visibleWhen>

+            </command>

+         </toolbar>

+      </menuContribution>

+      <menuContribution

+            allPopups="false"

+            locationURI="menu:org.eclipse.modisco.util.emffacet.ui.menu.loadCustomization">

+         <command

+               commandId="org.eclipse.modisco.infra.browser.editor.ui.command.linkscount"

+               label="%ShowLinksLabel"

+               style="toggle">

+         </command>

+      </menuContribution>

+      <menuContribution

+            allPopups="true"

+            locationURI="popup:org.eclipse.ui.popup.any">

+         <command

+               commandId="org.eclipse.ui.edit.copy"

+               label="%CopyLabel"

+               style="push">

+            <visibleWhen

+                  checkEnabled="false">

+               <with

+                     variable="activePart">

+                  <instanceof

+                        value="org.eclipse.modisco.infra.browser.editor.ui.internal.editor.TreeEditor">

+                  </instanceof>

+               </with>

+            </visibleWhen>

+         </command>

+      </menuContribution>

+   </extension>

+   <extension

+         point="org.eclipse.ui.commands">

+      <command

+            defaultHandler="org.eclipse.modisco.infra.browser.editor.ui.internal.handlers.LinksCountHandler"

+            id="org.eclipse.modisco.infra.browser.editor.ui.command.linkscount"

+            name="%ShowLinksLabel">

+         <state

+               class="org.eclipse.modisco.infra.browser.editor.ui.internal.handlers.LinksCountState"

+               id="org.eclipse.ui.commands.toggleState">

+         </state>

+      </command>

+   </extension>

+   <extension

+         point="org.eclipse.ui.handlers">

+      <handler

+            class="org.eclipse.modisco.infra.browser.editor.ui.internal.handlers.CopyHandler"

+            commandId="org.eclipse.ui.edit.copy">

+         <activeWhen>

+            <and>

+                <with variable="selection">

+                   <iterate

+                         ifEmpty="false"

+                         operator="and">

+                      <instanceof

+                            value="org.eclipse.emf.ecore.EObject">

+                      </instanceof>

+                   </iterate>

+                </with>

+                <with variable="activePart">

+                   <instanceof

+                       value="org.eclipse.modisco.infra.browser.editor.ui.internal.editor.TreeEditor">

+                   </instanceof>

+                </with>

+            </and>

+         </activeWhen>

+      </handler>

+   </extension>

+</plugin>

diff --git a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/Activator.java b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/Activator.java
new file mode 100644
index 0000000..0534068
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/Activator.java
@@ -0,0 +1,50 @@
+/** 

+ * Copyright (c) 2014 Mia-Software.

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

+ *    Gregoire Dupe (Mia-Software) - Bug 358914 - [Move to EMF Facet][Browser] Switch to EMF Facet

+ */

+package org.eclipse.modisco.infra.browser.editor.ui.internal;

+

+import org.eclipse.core.runtime.Plugin;

+import org.osgi.framework.BundleContext;

+

+@SuppressWarnings("PMD.UseSingleton")

+// @SuppressWarnings("PMD.UseSingleton") We cannot conforms to this rule because

+// this class is an Eclipse plug-in activator which will be instantiated by the

+// Eclipse framework.

+public class Activator extends Plugin {

+

+	private static Activator plugin;

+

+	@Override

+	@SuppressWarnings("PMD.SignatureDeclareThrowsException")

+	// @SuppressWarnings("PMD.SignatureDeclareThrowsException") We have to use

+	// this signature because this is an override of an Eclipse framework's

+	// method.

+	public void start(final BundleContext bundleContext) throws Exception {

+		super.start(bundleContext);

+		Activator.plugin = this;

+	}

+

+	@Override

+	@SuppressWarnings("PMD.SignatureDeclareThrowsException")

+	// @SuppressWarnings("PMD.SignatureDeclareThrowsException") We have to use

+	// this signature because this is an override of an Eclipse framework's

+	// method.

+	public void stop(final BundleContext bundleContext) throws Exception {

+		// NOPMD: PMD say "Assigning an Object to null is a code smell."

+		// No choice to right it in another way : this is an Eclipse pattern.

+		Activator.plugin = null; // NOPMD by gdupe on 30/03/12 10:19

+		super.stop(bundleContext);

+	}

+

+	public static Plugin getDefault() {

+		return Activator.plugin;

+	}

+

+}

diff --git a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/Messages.java b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/Messages.java
new file mode 100644
index 0000000..a289550
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/Messages.java
@@ -0,0 +1,25 @@
+/** 

+ * Copyright (c) 2014 Mia-Software.

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

+ *    Gregoire Dupe (Mia-Software) - Bug 358914 - [Move to EMF Facet][Browser] Switch to EMF Facet

+ */

+package org.eclipse.modisco.infra.browser.editor.ui.internal;

+

+import org.eclipse.osgi.util.NLS;

+

+public class Messages extends NLS {

+	private static final String BUNDLE_NAME = "org.eclipse.modisco.infra.browser.editor.ui.messages"; //$NON-NLS-1$

+	public static String ResourceBrowserOpener_EmfFacetDefaultTreeBrowser;

+	static {

+		// initialize resource bundle

+		NLS.initializeMessages(BUNDLE_NAME, Messages.class);

+	}

+

+	private Messages() {

+	}

+}

diff --git a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/editor/TreeEditor.java b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/editor/TreeEditor.java
new file mode 100644
index 0000000..3ce011f
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/editor/TreeEditor.java
@@ -0,0 +1,195 @@
+/** 

+ * Copyright (c) 2014 Mia-Software.

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

+ *    Gregoire Dupe (Mia-Software) - Bug 358914 - [Move to EMF Facet][Browser] Switch to EMF Facet

+ *    Thomas Cicognani (Soft-Maint) - Bug 442718 - Implement copy action in the new MoDisco Browser

+ */

+package org.eclipse.modisco.infra.browser.editor.ui.internal.editor;

+

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

+import org.eclipse.core.runtime.IPath;

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

+import org.eclipse.emf.common.command.BasicCommandStack;

+import org.eclipse.emf.common.command.CommandStack;

+import org.eclipse.emf.common.notify.AdapterFactory;

+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

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

+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.emf.edit.domain.AdapterFactoryEditingDomain;

+import org.eclipse.emf.edit.domain.EditingDomain;

+import org.eclipse.emf.edit.domain.IEditingDomainProvider;

+import org.eclipse.emf.facet.custom.core.ICustomizationManager;

+import org.eclipse.emf.facet.custom.core.ICustomizationManagerFactory;

+import org.eclipse.emf.facet.custom.core.ICustomizationManagerProvider;

+import org.eclipse.emf.facet.custom.ui.ICustomizedContentProviderFactory;

+import org.eclipse.emf.facet.custom.ui.IResolvingCustomizedLabelProviderFactory;

+import org.eclipse.emf.facet.efacet.core.IFacetManager;

+import org.eclipse.emf.facet.efacet.core.IFacetManagerFactory;

+import org.eclipse.emf.facet.efacet.core.IFacetManagerListener;

+import org.eclipse.emf.facet.efacet.core.IFacetManagerProvider;

+import org.eclipse.jface.action.MenuManager;

+import org.eclipse.jface.viewers.IContentProvider;

+import org.eclipse.jface.viewers.ILabelProvider;

+import org.eclipse.jface.viewers.ISelectionProvider;

+import org.eclipse.jface.viewers.TreeViewer;

+import org.eclipse.modisco.infra.browser.editor.ui.internal.Activator;

+import org.eclipse.modisco.infra.browser.editor.ui.internal.opener.ResourceEditorInput;

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.swt.widgets.Menu;

+import org.eclipse.ui.IEditorInput;

+import org.eclipse.ui.IEditorSite;

+import org.eclipse.ui.PartInitException;

+import org.eclipse.ui.part.EditorPart;

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

+

+public class TreeEditor extends EditorPart implements IEditingDomainProvider,

+		IFacetManagerProvider, ICustomizationManagerProvider {

+

+	private static final String EDITOR_ID = Activator.getDefault().getBundle()

+			.getSymbolicName() + ".TreeEditor"; //$NON-NLS-1$

+	private Resource resource;

+	private ResourceSet resourceSet;

+	private EditingDomain editingDomain;

+	private IFacetManager facetManager;

+	private ICustomizationManager customManager;

+	private TreeViewer tree;

+	private IFacetManagerListener facetMgrListener;

+

+	@Override

+	public void doSave(final IProgressMonitor monitor) {

+		// TODO Auto-generated method stub

+	}

+

+	@Override

+	public void doSaveAs() {

+		// TODO Auto-generated method stub

+	}

+

+	@Override

+	public void init(final IEditorSite site, final IEditorInput input)

+			throws PartInitException {

+		setSite(site);

+		setInput(input);

+		if (input instanceof FileEditorInput) {

+			final FileEditorInput fileEI = (FileEditorInput) input;

+			final IFile file = fileEI.getFile();

+			final IPath path = file.getFullPath();

+			final String pathStr = path.toString();

+			final URI uri = URI.createPlatformResourceURI(pathStr, true);

+			this.resourceSet = new ResourceSetImpl();

+			this.resource = this.resourceSet.getResource(uri, true);

+		} else if (input instanceof ResourceEditorInput) {

+			final ResourceEditorInput resourceEI = (ResourceEditorInput) input;

+			this.resource = resourceEI.getResource();

+			this.resourceSet = this.resource.getResourceSet();

+		}

+		final AdapterFactory adapterFactory = new AdapterFactoryImpl();

+		final CommandStack commandStack = new BasicCommandStack();

+		this.editingDomain = new AdapterFactoryEditingDomain(adapterFactory,

+				commandStack, this.resourceSet);

+	}

+	

+	

+	private void createPopupMenu() {

+		final MenuManager menuMgr = new MenuManager("#PopupMenu"); //$NON-NLS-1$

+		menuMgr.setRemoveAllWhenShown(true);

+		final Menu menu = menuMgr.createContextMenu(this.tree.getControl());

+		this.tree.getControl().setMenu(menu);

+		getSite().registerContextMenu(menuMgr, this.tree);

+	}

+

+	@Override

+	public boolean isDirty() {

+		// TODO Auto-generated method stub

+		return false;

+	}

+

+	@Override

+	public boolean isSaveAsAllowed() {

+		// TODO Auto-generated method stub

+		return false;

+	}

+

+	@Override

+	public void createPartControl(final Composite parent) {

+		this.tree = new TreeViewer(parent);

+		this.facetManager = IFacetManagerFactory.DEFAULT

+				.getOrCreateFacetManager(this.resourceSet);

+		this.customManager = ICustomizationManagerFactory.DEFAULT

+				.getOrCreateICustomizationManager(this.resourceSet);

+		final ILabelProvider labelProvider = IResolvingCustomizedLabelProviderFactory.DEFAULT

+				.createCustomizedLabelProvider(this.customManager);

+		final IContentProvider contentProvider = ICustomizedContentProviderFactory.DEFAULT

+				.createCustomizedTreeContentProvider(this.customManager);

+		this.tree.setContentProvider(contentProvider);

+		this.tree.setLabelProvider(labelProvider);

+		this.tree.setInput(this.resource.getContents());

+		getSite().setSelectionProvider(this.tree);

+		this.facetMgrListener = new IFacetManagerListener() {

+			public void facetManagerChanged() {

+				TreeEditor.this.refresh();

+			}

+		};

+		createPopupMenu();

+		this.facetManager.addListener(this.facetMgrListener);

+	}

+

+	protected void refresh() {

+		final Object[] expanededElts = this.tree.getExpandedElements();

+		this.tree.refresh();

+		this.tree.setExpandedElements(expanededElts);

+	}

+

+	@Override

+	public void setFocus() {

+		// TODO Auto-generated method stub

+

+	}

+

+	public static String getEditorId() {

+		return EDITOR_ID;

+	}

+

+	public EditingDomain getEditingDomain() {

+		return this.editingDomain;

+	}

+	

+	@Override

+	public Object getAdapter(@SuppressWarnings("rawtypes") final Class adapter) {

+		/* @SuppressWarnings("rawtypes"): gdupe> Imposed by the super class */

+		Object result = null;

+		if (adapter.isInstance(this)) {

+			result = this;

+		} else if (adapter == ISelectionProvider.class) {

+			result = this.tree;

+		} else {

+			result = super.getAdapter(adapter);

+		}

+		return result;

+	}

+

+	public ICustomizationManager getCustomizationManager() {

+		return this.customManager;

+	}

+

+	public IFacetManager getFacetManager() {

+		return this.facetManager;

+	}

+	

+	@Override

+	public void dispose() {

+		this.facetManager.removeListener(this.facetMgrListener);

+		super.dispose();

+	}

+

+	public ILabelProvider getViewerLabelProvider() {

+		return (ILabelProvider) this.tree.getLabelProvider();

+	}

+}

diff --git a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/AbstractFacetSetActivatorHandler.java b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/AbstractFacetSetActivatorHandler.java
new file mode 100644
index 0000000..adc365b
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/AbstractFacetSetActivatorHandler.java
@@ -0,0 +1,90 @@
+/** 

+ * Copyright (c) 2014 Soft-Maint.

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

+ *    Thomas Cicognani (Soft-Maint) - Bug 442257 - New toolbar actions to (des)activate customizations

+ *    Thomas Cicognani (Soft-Maint) - Bug 442714 - New toolbar action to show/hide eContainer link

+ */

+package org.eclipse.modisco.infra.browser.editor.ui.internal.handlers;

+

+import java.util.List;

+

+import org.eclipse.core.commands.AbstractHandler;

+import org.eclipse.core.commands.ExecutionEvent;

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

+import org.eclipse.emf.facet.custom.core.ICustomizationManager;

+import org.eclipse.emf.facet.custom.core.ICustomizationManagerProvider;

+import org.eclipse.emf.facet.efacet.core.IFacetManager;

+import org.eclipse.emf.facet.efacet.core.IFacetSetCatalogManager;

+import org.eclipse.emf.facet.efacet.core.IFacetSetCatalogManagerFactory;

+import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetSet;

+import org.eclipse.ui.IWorkbenchPart;

+import org.eclipse.ui.handlers.HandlerUtil;

+

+/**

+ * Abstract Handler to manage menu toolbar shortcuts. These shortcuts allow

+ * users to (des)activate facet sets (customizations are facet sets). If you

+ * want to create a menu shortcut, your Handler must extends this class

+ */

+public abstract class AbstractFacetSetActivatorHandler extends AbstractHandler {

+

+	/**

+	 * Execute the Handler

+	 * 

+	 * @param event

+	 *            The execution event that contains the application context

+	 * @param facetSetID

+	 *            ID of the facet set linked to this Handler

+	 * @return the result of the execution. Reserved for future use, can be

+	 *         null.

+	 * @throws ExecutionException

+	 */

+	protected static Object execute(final ExecutionEvent event,

+			final String facetSetID) throws ExecutionException {

+		final boolean toggle = HandlerUtil.toggleCommandState(event

+				.getCommand());

+		final IWorkbenchPart activePart = HandlerUtil.getActivePart(event);

+		if (activePart != null) {

+			final ICustomizationManagerProvider customMgrProvider = (ICustomizationManagerProvider) activePart

+					.getAdapter(ICustomizationManagerProvider.class);

+			if (customMgrProvider != null) {

+				execute(facetSetID, toggle, customMgrProvider);

+			}

+		}

+		return null;

+	}

+

+	private static void execute(final String facetSetID, final boolean toggle,

+			final ICustomizationManagerProvider customMgrProvider) {

+		final ICustomizationManager manager = customMgrProvider

+				.getCustomizationManager();

+

+		final IFacetSetCatalogManager catalog = IFacetSetCatalogManagerFactory.DEFAULT

+				.getOrCreateFacetSetCatalogManager(manager.getResourceSet());

+

+		FacetSet facetSetToActive = null;

+		for (FacetSet facetSet : catalog.getRegisteredFacetSets()) {

+			if (facetSetID.equals(facetSet.getName())) {

+				facetSetToActive = facetSet;

+				break;

+			}

+		}

+		if (facetSetToActive != null) {

+			final IFacetManager facetManager = manager.getFacetManager();

+			final List<FacetSet> managedFacetSets = facetManager

+					.getManagedFacetSets();

+			if (toggle) {

+				managedFacetSets.remove(facetSetToActive);

+			} else {

+				if (!managedFacetSets.contains(facetSetToActive)) {

+					managedFacetSets.add(0, facetSetToActive);

+				}

+			}

+		}

+	}

+

+}

diff --git a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/AbstractFacetSetActivatorToggleState.java b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/AbstractFacetSetActivatorToggleState.java
new file mode 100644
index 0000000..a370820
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/AbstractFacetSetActivatorToggleState.java
@@ -0,0 +1,122 @@
+/** 

+ * Copyright (c) 2014 Soft-Maint.

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

+ *    Thomas Cicognani (Soft-Maint) - Bug 442257 - New toolbar actions to (des)activate customizations

+ *    Thomas Cicognani (Soft-Maint) - Bug 442714 - New toolbar action to show/hide eContainer link

+ */

+package org.eclipse.modisco.infra.browser.editor.ui.internal.handlers;

+

+import java.util.List;

+

+import org.eclipse.emf.facet.efacet.core.IFacetManager;

+import org.eclipse.emf.facet.efacet.core.IFacetManagerListener;

+import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetSet;

+import org.eclipse.jface.commands.ToggleState;

+import org.eclipse.modisco.infra.browser.editor.ui.internal.editor.TreeEditor;

+import org.eclipse.ui.IPartListener;

+import org.eclipse.ui.IWorkbenchPage;

+import org.eclipse.ui.IWorkbenchPart;

+import org.eclipse.ui.IWorkbenchWindow;

+import org.eclipse.ui.PlatformUI;

+

+/**

+ * Abstract ToggleState to manage menu toolbar shortcuts. These shortcuts allow

+ * users to (des)activate facet sets (customizations are facet sets). If you

+ * want to create a menu shortcut, your ToggleState must extends this class

+ */

+public abstract class AbstractFacetSetActivatorToggleState extends ToggleState {

+

+	private final IPartListener partListener;

+	private final IFacetManagerListener facetMgrListener;

+

+	private IFacetManager facetManager;

+	private final String facetSetID;

+

+	protected AbstractFacetSetActivatorToggleState(final String facetSetID) {

+		/*

+		 * No persistence and initialized to FALSE (unchecked button)

+		 */

+		super();

+		setShouldPersist(false);

+		setValue(Boolean.FALSE);

+		this.facetSetID = facetSetID;

+		this.partListener = new IPartListener() {

+			public void partOpened(final IWorkbenchPart part) {

+				// DO NOTHING

+			}

+

+			public void partDeactivated(final IWorkbenchPart part) {

+				// DO NOTHING

+			}

+

+			public void partClosed(final IWorkbenchPart part) {

+				// DO NOTHING

+			}

+

+			public void partBroughtToTop(final IWorkbenchPart part) {

+				// DO NOTHING

+			}

+

+			public void partActivated(final IWorkbenchPart part) {

+				AbstractFacetSetActivatorToggleState.this.partActivated(part);

+			}

+		};

+

+		this.facetMgrListener = new IFacetManagerListener() {

+			public void facetManagerChanged() {

+				changeToggleState();

+			}

+		};

+	}

+

+	protected void partActivated(final IWorkbenchPart part) {

+		if (part instanceof TreeEditor) {

+			final TreeEditor treeEditor = (TreeEditor) part;

+			this.facetManager = treeEditor.getFacetManager();

+			this.facetManager.removeListener(this.facetMgrListener);

+			this.facetManager.addListener(this.facetMgrListener);

+			changeToggleState();

+		}

+	}

+

+	/**

+	 * Check if the facet set linked to this ToogleState is activated. If so,

+	 * the ToggleState is checked

+	 */

+	protected void changeToggleState() {

+		final List<FacetSet> facetSets = this.facetManager

+				.getManagedFacetSets();

+		for (FacetSet facetSet : facetSets) {

+			if (this.facetSetID.equals(facetSet.getName())) {

+				setValue(Boolean.TRUE);

+				break;

+			} else if (!this.getValue().equals(Boolean.FALSE)) {

+				setValue(Boolean.FALSE);

+			}

+		}

+	}

+

+	@Override

+	public Object getValue() {

+		/*

+		 * Add a listener which changes all ToggleStates when user changes the

+		 * activated editor

+		 */

+		final IWorkbenchWindow window = PlatformUI.getWorkbench()

+				.getActiveWorkbenchWindow();

+		if (window != null) {

+			final IWorkbenchPage activePage = window.getActivePage();

+			if (activePage != null) {

+				activePage.removePartListener(this.partListener);

+				activePage.addPartListener(this.partListener);

+			}

+		}

+		return super.getValue();

+	}

+

+}

diff --git a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/CopyHandler.java b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/CopyHandler.java
new file mode 100644
index 0000000..9b24c83
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/CopyHandler.java
@@ -0,0 +1,71 @@
+/** 

+ * Copyright (c) 2014 Soft-Maint.

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

+ *    Thomas Cicognani (Soft-Maint) - Bug 442718 - Implement copy action in the new MoDisco Browser

+ */

+package org.eclipse.modisco.infra.browser.editor.ui.internal.handlers;

+

+import java.util.ArrayList;

+import java.util.Iterator;

+import java.util.List;

+

+import org.eclipse.core.commands.AbstractHandler;

+import org.eclipse.core.commands.ExecutionEvent;

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

+import org.eclipse.jface.viewers.ILabelProvider;

+import org.eclipse.jface.viewers.ISelection;

+import org.eclipse.jface.viewers.IStructuredSelection;

+import org.eclipse.modisco.infra.browser.editor.ui.internal.editor.TreeEditor;

+import org.eclipse.swt.dnd.Clipboard;

+import org.eclipse.swt.dnd.TextTransfer;

+import org.eclipse.swt.dnd.Transfer;

+import org.eclipse.swt.widgets.Shell;

+import org.eclipse.ui.IEditorPart;

+import org.eclipse.ui.handlers.HandlerUtil;

+

+public class CopyHandler extends AbstractHandler {

+

+	public Object execute(final ExecutionEvent event) throws ExecutionException {

+		final ISelection selection = HandlerUtil.getCurrentSelection(event);

+		final IEditorPart activeEditor = HandlerUtil.getActiveEditor(event);

+		if (selection instanceof IStructuredSelection

+				&& activeEditor instanceof TreeEditor) {

+			final List<String> names = new ArrayList<String>();

+

+			final TreeEditor editor = (TreeEditor) activeEditor;

+			final ILabelProvider labelProvider = editor

+					.getViewerLabelProvider();

+

+			final IStructuredSelection structSelection = (IStructuredSelection) selection;

+			final Iterator<?> selIterator = structSelection.iterator();

+			while (selIterator.hasNext()) {

+				final Object item = selIterator.next();

+				final String name = labelProvider.getText(item);

+				names.add(name);

+			}

+			if (!names.isEmpty()) {

+				final StringBuilder buffer = new StringBuilder();

+				for (String name : names) {

+					buffer.append(name);

+					buffer.append('\n');

+				}

+				final Shell shell = HandlerUtil.getActiveShell(event);

+				final Clipboard clipboard = new Clipboard(shell.getDisplay());

+				final TextTransfer textTransfer = TextTransfer.getInstance();

+				/*

+				 * Remove the last \n with the regular expression

+				 */

+				clipboard.setContents(new Object[] { buffer.toString()

+						.replaceAll("\n$", "") }, //$NON-NLS-1$ //$NON-NLS-2$

+						new Transfer[] { textTransfer });

+			}

+		}

+		return null;

+	}

+

+}

diff --git a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/EContainerHandler.java b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/EContainerHandler.java
new file mode 100644
index 0000000..bc43f0e
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/EContainerHandler.java
@@ -0,0 +1,24 @@
+/** 

+ * Copyright (c) 2014 Soft-Maint.

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

+ *    Thomas Cicognani (Soft-Maint) - Bug 442714 - New toolbar action to show/hide eContainer link

+ */

+package org.eclipse.modisco.infra.browser.editor.ui.internal.handlers;

+

+import org.eclipse.core.commands.ExecutionEvent;

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

+

+public class EContainerHandler extends AbstractFacetSetActivatorHandler {

+

+	private static final String FACET_SET_ID = "org.eclipse.emf.facet.ecore.econtainer"; //$NON-NLS-1$

+

+	public Object execute(final ExecutionEvent event) throws ExecutionException {

+		return execute(event, FACET_SET_ID);

+	}

+

+}

diff --git a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/EContainerToggleState.java b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/EContainerToggleState.java
new file mode 100644
index 0000000..065a3ef
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/EContainerToggleState.java
@@ -0,0 +1,21 @@
+/** 

+ * Copyright (c) 2014 Soft-Maint.

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

+ *    Thomas Cicognani (Soft-Maint) - Bug 442714 - New toolbar action to show/hide eContainer link

+ */

+package org.eclipse.modisco.infra.browser.editor.ui.internal.handlers;

+

+public class EContainerToggleState extends AbstractFacetSetActivatorToggleState {

+

+	private static final String FACET_SET_ID = "org.eclipse.emf.facet.ecore.econtainer"; //$NON-NLS-1$

+	

+	public EContainerToggleState() {

+		super(FACET_SET_ID);

+	}

+

+}

diff --git a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/LinksCountHandler.java b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/LinksCountHandler.java
new file mode 100644
index 0000000..7b3ab34
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/LinksCountHandler.java
@@ -0,0 +1,25 @@
+/** 

+ * Copyright (c) 2014 Soft-Maint.

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

+ *    Thomas Cicognani (Soft-Maint) - Bug 442257 - New toolbar actions to (des)activate customizations

+ *    Thomas Cicognani (Soft-Maint) - Bug 442714 - New toolbar action to show/hide eContainer link

+ */

+package org.eclipse.modisco.infra.browser.editor.ui.internal.handlers;

+

+import org.eclipse.core.commands.ExecutionEvent;

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

+

+public class LinksCountHandler extends AbstractFacetSetActivatorHandler {

+

+	private static final String CUSTOM_ID = "org.eclipse.modisco.infra.browser.ecore.core.linksCount"; //$NON-NLS-1$

+

+	public Object execute(final ExecutionEvent event) throws ExecutionException {

+		return execute(event, CUSTOM_ID);

+	}

+

+}

diff --git a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/LinksCountState.java b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/LinksCountState.java
new file mode 100644
index 0000000..dd3c542
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/LinksCountState.java
@@ -0,0 +1,22 @@
+/** 

+ * Copyright (c) 2014 Soft-Maint.

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

+ *    Thomas Cicognani (Soft-Maint) - Bug 442257 - New toolbar actions to (des)activate customizations

+ *    Thomas Cicognani (Soft-Maint) - Bug 442714 - New toolbar action to show/hide eContainer link

+ */

+package org.eclipse.modisco.infra.browser.editor.ui.internal.handlers;

+

+public class LinksCountState extends AbstractFacetSetActivatorToggleState {

+

+	private static final String CUSTOM_ID = "org.eclipse.modisco.infra.browser.ecore.core.linksCount"; //$NON-NLS-1$

+

+	public LinksCountState() {

+		super(CUSTOM_ID);

+	}

+

+}

diff --git a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/messages.properties b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/messages.properties
new file mode 100644
index 0000000..62ec593
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/messages.properties
@@ -0,0 +1,10 @@
+# Copyright (c) 2014 Mia-Software.

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

+#    Gregoire Dupe (Mia-Software) - Bug 358914 - [Move to EMF Facet][Browser] Switch to EMF Facet

+#

+ResourceBrowserOpener_EmfFacetDefaultTreeBrowser=EMF Facet Default Tree Browser

diff --git a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/opener/ResourceBrowserOpener.java b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/opener/ResourceBrowserOpener.java
new file mode 100644
index 0000000..3f89638
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/opener/ResourceBrowserOpener.java
@@ -0,0 +1,50 @@
+/** 

+ * Copyright (c) 2014 Mia-Software.

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

+ *    Gregoire Dupe (Mia-Software) - Bug 358914 - [Move to EMF Facet][Browser] Switch to EMF Facet

+ */

+package org.eclipse.modisco.infra.browser.editor.ui.internal.opener;

+

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

+import org.eclipse.emf.facet.util.core.Logger;

+import org.eclipse.emf.facet.util.emf.core.IResourceBrowserOpener;

+import org.eclipse.modisco.infra.browser.editor.ui.internal.Activator;

+import org.eclipse.modisco.infra.browser.editor.ui.internal.Messages;

+import org.eclipse.modisco.infra.browser.editor.ui.internal.editor.TreeEditor;

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

+import org.eclipse.ui.IWorkbench;

+import org.eclipse.ui.IWorkbenchPage;

+import org.eclipse.ui.IWorkbenchWindow;

+import org.eclipse.ui.PlatformUI;

+import org.eclipse.ui.ide.IDE;

+

+public class ResourceBrowserOpener implements IResourceBrowserOpener {

+

+	public void openResource(final Resource resource) {

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

+			public void run() {

+				try {

+					final IWorkbench workbench = PlatformUI.getWorkbench();

+					final IWorkbenchWindow window = workbench

+							.getActiveWorkbenchWindow();

+					final IWorkbenchPage page = window.getActivePage();

+					IDE.openEditor(page, new ResourceEditorInput(resource),

+							TreeEditor.getEditorId(), true);

+				} catch (Exception e) {

+					Logger.logError(e, Activator.getDefault());

+				}

+			}

+		});

+

+	}

+

+	public String getBrowserName() {

+		return Messages.ResourceBrowserOpener_EmfFacetDefaultTreeBrowser;

+	}

+

+}

diff --git a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/opener/ResourceEditorInput.java b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/opener/ResourceEditorInput.java
new file mode 100644
index 0000000..130bd17
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/opener/ResourceEditorInput.java
@@ -0,0 +1,80 @@
+/** 

+ * Copyright (c) 2014 Mia-Software.

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

+ *    Gregoire Dupe (Mia-Software) - Bug 358914 - [Move to EMF Facet][Browser] Switch to EMF Facet

+ */

+package org.eclipse.modisco.infra.browser.editor.ui.internal.opener;

+

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

+import org.eclipse.jface.resource.ImageDescriptor;

+import org.eclipse.ui.IEditorInput;

+import org.eclipse.ui.IPersistableElement;

+

+/**

+ * A default implementation of {@link IResourceEditorInput}. For editors that

+ * can take a {@link Resource} as an input (supported by the EmfFacet model

+ * browser)

+ */

+public class ResourceEditorInput implements IEditorInput {

+

+	private final Resource resource;

+

+	public ResourceEditorInput(final Resource resource) {

+		this.resource = resource;

+	}

+

+	public boolean exists() {

+		return false;

+	}

+

+	public ImageDescriptor getImageDescriptor() {

+		return null;

+	}

+

+	public String getName() {

+		String lastSegment = this.resource.getURI().lastSegment();

+		if (lastSegment == null) {

+			lastSegment = ""; //$NON-NLS-1$

+		}

+		return lastSegment;

+	}

+

+	public IPersistableElement getPersistable() {

+		return null;

+	}

+

+	public String getToolTipText() {

+		return getName();

+	}

+

+	public Object getAdapter(@SuppressWarnings("rawtypes") final Class adapter) {

+		// @SuppressWarnings("rawtypes") : imposed by the implemented interface.

+		return null;

+	}

+

+	public Resource getResource() {

+		return this.resource;

+	}

+

+	@Override

+	public boolean equals(final Object other) {

+		boolean result = false;

+		if (other instanceof ResourceEditorInput) {

+			final ResourceEditorInput otherEditorInput = (ResourceEditorInput) other;

+			final Resource otherResource = otherEditorInput.getResource();

+			result = otherResource.equals(getResource());

+		}

+		return result;

+	}

+

+	@Override

+	public int hashCode() {

+		return this.resource.hashCode();

+	}

+

+}

diff --git a/org.eclipse.modisco.infra.browser.feature/.project b/org.eclipse.modisco.infra.browser.feature/.project
new file mode 100644
index 0000000..b315c1f
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>org.eclipse.modisco.infra.browser.feature</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.pde.FeatureBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.pde.FeatureNature</nature>

+	</natures>

+</projectDescription>

diff --git a/org.eclipse.modisco.infra.browser.feature/.settings/org.eclipse.core.resources.prefs b/org.eclipse.modisco.infra.browser.feature/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..4824b80
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.feature/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1

+encoding/<project>=UTF-8

diff --git a/org.eclipse.modisco.infra.browser.feature/build.properties b/org.eclipse.modisco.infra.browser.feature/build.properties
new file mode 100644
index 0000000..3104d6d
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.feature/build.properties
@@ -0,0 +1,2 @@
+bin.includes = feature.xml,\

+               feature.properties

diff --git a/org.eclipse.modisco.infra.browser.feature/feature.properties b/org.eclipse.modisco.infra.browser.feature/feature.properties
new file mode 100644
index 0000000..f00f3d8
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.feature/feature.properties
@@ -0,0 +1,16 @@
+###############################################################################

+# Copyright (c) 2014 Mia-Software.

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

+#     Gregoire Dupe (Mia-Software)

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

+

+featureName=MoDisco Browser (Incubation)

+providerName=Eclipse Modeling Project

+description=MoDisco is a framework for model driven reverse engineering and \

+software modernization. This feature provides the MoDisco browser (compliant with EMF Facet).

+ModelingUpdateSiteName=Eclipse Modeling Project Updates

diff --git a/org.eclipse.modisco.infra.browser.feature/feature.xml b/org.eclipse.modisco.infra.browser.feature/feature.xml
new file mode 100644
index 0000000..b4b91ab
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.feature/feature.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<feature

+      id="org.eclipse.modisco.infra.browser.feature"

+      label="%featureName"

+      version="0.13.2.qualifier"

+      provider-name="%providerName"

+      license-feature="org.eclipse.license"

+      license-feature-version="0.0.0">

+

+   <description url="https://www.eclipse.org/MoDisco/">

+      %description

+   </description>

+

+   <copyright>

+      Copyright (c) 2014 Mia-Software.
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License
+v1.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v10.html

+   </copyright>

+

+   <license url="%licenseURL">

+      %license

+   </license>

+

+   <plugin

+         id="org.eclipse.modisco.infra.browser.ecore.core"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+   <plugin

+         id="org.eclipse.modisco.infra.browser.editor.ui"

+         download-size="0"

+         install-size="0"

+         version="0.0.0"

+         unpack="false"/>

+

+</feature>

diff --git a/org.eclipse.modisco.infra.browser.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.browser.tests/META-INF/MANIFEST.MF
index d547fb6..953f3b4 100644
--- a/org.eclipse.modisco.infra.browser.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.infra.browser.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.infra.browser.tests;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.swtbot.swt.finder;resolution:=optional,
  org.eclipse.swtbot.eclipse.finder,
diff --git a/org.eclipse.modisco.infra.browser.tests/src/org/eclipse/modisco/infra/browser/tests/AllTestsInUIThread.java b/org.eclipse.modisco.infra.browser.tests/src/org/eclipse/modisco/infra/browser/tests/AllTestsNotInUIThread.java
similarity index 95%
rename from org.eclipse.modisco.infra.browser.tests/src/org/eclipse/modisco/infra/browser/tests/AllTestsInUIThread.java
rename to org.eclipse.modisco.infra.browser.tests/src/org/eclipse/modisco/infra/browser/tests/AllTestsNotInUIThread.java
index 862e64b..6fd4573 100644
--- a/org.eclipse.modisco.infra.browser.tests/src/org/eclipse/modisco/infra/browser/tests/AllTestsInUIThread.java
+++ b/org.eclipse.modisco.infra.browser.tests/src/org/eclipse/modisco/infra/browser/tests/AllTestsNotInUIThread.java
@@ -23,6 +23,6 @@
 	TestURIDialog.class

 	})

 // NO JavaScalabilityTest !

-public class AllTestsInUIThread {

+public class AllTestsNotInUIThread {
 	// JUnit 4 test suite

 }

diff --git a/org.eclipse.modisco.infra.browser.tests/src/org/eclipse/modisco/infra/browser/tests/TestMetaclasses.java b/org.eclipse.modisco.infra.browser.tests/src/org/eclipse/modisco/infra/browser/tests/TestMetaclasses.java
index 104cd4e..da8d4b2 100644
--- a/org.eclipse.modisco.infra.browser.tests/src/org/eclipse/modisco/infra/browser/tests/TestMetaclasses.java
+++ b/org.eclipse.modisco.infra.browser.tests/src/org/eclipse/modisco/infra/browser/tests/TestMetaclasses.java
@@ -40,6 +40,7 @@
 import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;

 import org.junit.AfterClass;

 import org.junit.BeforeClass;

+import org.junit.Ignore;

 import org.junit.Test;

 import org.junit.runner.RunWith;

 import org.junit.runners.Parameterized;

@@ -48,6 +49,7 @@
 /**

  * Tests about metaclasses and the metaclass pane.

  */

+@Ignore //cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=359257

 @SuppressWarnings("restriction")

 @RunWith(Parameterized.class)

 public class TestMetaclasses {

diff --git a/org.eclipse.modisco.infra.browser.tests/src/org/eclipse/modisco/infra/browser/tests/TestNavigate.java b/org.eclipse.modisco.infra.browser.tests/src/org/eclipse/modisco/infra/browser/tests/TestNavigate.java
index a974d9c..6b7cc0e 100644
--- a/org.eclipse.modisco.infra.browser.tests/src/org/eclipse/modisco/infra/browser/tests/TestNavigate.java
+++ b/org.eclipse.modisco.infra.browser.tests/src/org/eclipse/modisco/infra/browser/tests/TestNavigate.java
@@ -14,8 +14,10 @@
 import org.eclipse.modisco.infra.browser.tests.utils.TestUtils;

 import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;

 import org.eclipse.swtbot.swt.finder.waits.DefaultCondition;

+import org.junit.Ignore;

 import org.junit.Test;

 

+@Ignore //cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=468159

 /** Tests for the search function. */

 public class TestNavigate extends AbstractTest {

 

diff --git a/org.eclipse.modisco.infra.browser.tests/src/org/eclipse/modisco/infra/browser/tests/TestOpenModel.java b/org.eclipse.modisco.infra.browser.tests/src/org/eclipse/modisco/infra/browser/tests/TestOpenModel.java
index 27885e7..0fefff7 100644
--- a/org.eclipse.modisco.infra.browser.tests/src/org/eclipse/modisco/infra/browser/tests/TestOpenModel.java
+++ b/org.eclipse.modisco.infra.browser.tests/src/org/eclipse/modisco/infra/browser/tests/TestOpenModel.java
@@ -31,11 +31,13 @@
 import org.junit.After;

 import org.junit.AfterClass;

 import org.junit.BeforeClass;

+import org.junit.Ignore;

 import org.junit.Test;

 import org.junit.runner.RunWith;

 import org.junit.runners.Parameterized;

 import org.junit.runners.Parameterized.Parameters;

 

+@Ignore //cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=468159

 @RunWith(Parameterized.class)

 public class TestOpenModel {

 

diff --git a/org.eclipse.modisco.infra.browser.tests/src/org/eclipse/modisco/infra/browser/tests/TestSearch.java b/org.eclipse.modisco.infra.browser.tests/src/org/eclipse/modisco/infra/browser/tests/TestSearch.java
index 7515edb..7ad8dc6 100644
--- a/org.eclipse.modisco.infra.browser.tests/src/org/eclipse/modisco/infra/browser/tests/TestSearch.java
+++ b/org.eclipse.modisco.infra.browser.tests/src/org/eclipse/modisco/infra/browser/tests/TestSearch.java
@@ -19,8 +19,10 @@
 import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;

 import org.eclipse.swtbot.swt.finder.widgets.SWTBotText;

 import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;

+import org.junit.Ignore;

 import org.junit.Test;

 

+@Ignore //cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=468159

 /** Tests for the search function. */

 public class TestSearch extends AbstractTest {

 

diff --git a/org.eclipse.modisco.infra.browser.tests/src/org/eclipse/modisco/infra/browser/tests/TestURIDialog.java b/org.eclipse.modisco.infra.browser.tests/src/org/eclipse/modisco/infra/browser/tests/TestURIDialog.java
index 2e1eb04..576345e 100644
--- a/org.eclipse.modisco.infra.browser.tests/src/org/eclipse/modisco/infra/browser/tests/TestURIDialog.java
+++ b/org.eclipse.modisco.infra.browser.tests/src/org/eclipse/modisco/infra/browser/tests/TestURIDialog.java
@@ -29,8 +29,10 @@
 import org.eclipse.swtbot.swt.finder.widgets.SWTBotToolbarButton;

 import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;

 import org.junit.BeforeClass;

+import org.junit.Ignore;

 import org.junit.Test;

 

+@Ignore //cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=468159

 public class TestURIDialog {

 

 	protected static SWTWorkbenchBot bot = new SWTWorkbenchBot();

diff --git a/org.eclipse.modisco.infra.cdo.derby.feature/feature.xml b/org.eclipse.modisco.infra.cdo.derby.feature/feature.xml
index c8199e7..dd4b703 100644
--- a/org.eclipse.modisco.infra.cdo.derby.feature/feature.xml
+++ b/org.eclipse.modisco.infra.cdo.derby.feature/feature.xml
@@ -12,7 +12,7 @@
 <feature

       id="org.eclipse.modisco.infra.cdo.derby.feature"

       label="MoDisco CDO server with Derby (Incubation)"

-      version="0.12.2.qualifier"

+      version="0.13.2.qualifier"

       provider-name="%providerName"

       license-feature="org.eclipse.license"

       license-feature-version="0.0.0">

diff --git a/org.eclipse.modisco.infra.common.core.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.common.core.tests/META-INF/MANIFEST.MF
index 7e890b4..dd415ff 100644
--- a/org.eclipse.modisco.infra.common.core.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.infra.common.core.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %Bundle-Name

 Bundle-SymbolicName: org.eclipse.modisco.infra.common.core.tests;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-Vendor: %Bundle-Vendor

 Require-Bundle: org.junit;bundle-version="4.7.0",

  org.eclipse.gmt.modisco.infra.common.core;bundle-version="0.8.0",

diff --git a/org.eclipse.modisco.infra.common.core.tests/src/org/eclipse/modisco/infra/common/core/tests/Activator.java b/org.eclipse.modisco.infra.common.core.tests/src/org/eclipse/modisco/infra/common/core/tests/Activator.java
index 81aadfc..2f22f64 100644
--- a/org.eclipse.modisco.infra.common.core.tests/src/org/eclipse/modisco/infra/common/core/tests/Activator.java
+++ b/org.eclipse.modisco.infra.common.core.tests/src/org/eclipse/modisco/infra/common/core/tests/Activator.java
@@ -13,6 +13,10 @@
 import org.eclipse.core.runtime.Plugin;

 import org.osgi.framework.BundleContext;

 

+/**

+ * @deprecated Will become internal cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470609

+ */

+@Deprecated

 public class Activator extends Plugin {

 

 	private static Activator plugin;

diff --git a/org.eclipse.modisco.infra.discovery.benchmark.core/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.discovery.benchmark.core/META-INF/MANIFEST.MF
index eb9ef38..e2a6895 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.infra.discovery.benchmark.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.infra.discovery.benchmark.core;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.infra.discovery.benchmark.core.internal.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.core.runtime,
@@ -23,5 +23,6 @@
  org.eclipse.modisco.utils.chart.metamodel;bundle-version="0.10.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.modisco.infra.discovery.benchmark.core.internal.exported;x-friends:="org.eclipse.modisco.infra.discovery.benchmark.ui"
+Export-Package: org.eclipse.modisco.infra.discovery.benchmark.core.internal.exported;x-friends:="org.eclipse.modisco.infra.discovery.benchmark.ui",
+ org.eclipse.modisco.infra.discovery.benchmark.core.internal.reporting.internal;x-internal:=true
 
diff --git a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/impl/DiscovererBenchmarkDiscoverer.java b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/impl/DiscovererBenchmarkDiscoverer.java
index 407b7ee..b33630d 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/impl/DiscovererBenchmarkDiscoverer.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/impl/DiscovererBenchmarkDiscoverer.java
@@ -1,11 +1,15 @@
 /*******************************************************************************

- * Copyright (c) 2012 INRIA. All rights reserved. This program and the

+ * Copyright (c) 2012, 2015 INRIA, and Mia-Software.

+ * 

+ * 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: Guillaume Doux - INRIA - Initial API and implementation

- * 

+ * Contributors:

+ *    Guillaume Doux (INRIA) - Initial API and implementation

+ *    Grégoire Dupé (Mia-Software) - Bug 482672 - Benchmark command line interface

+ *    Grégoire Dupé (Mia-Software) - Bug 482857 - Discoverer Benchmark Report : wrong namespaces

  ******************************************************************************/

 package org.eclipse.modisco.infra.discovery.benchmark.core.internal.impl;

 

@@ -26,6 +30,8 @@
 import org.eclipse.core.resources.IFolder;

 import org.eclipse.core.resources.IProject;

 import org.eclipse.core.resources.IResource;

+import org.eclipse.core.resources.IWorkspace;

+import org.eclipse.core.resources.IWorkspaceRoot;

 import org.eclipse.core.resources.ResourcesPlugin;

 import org.eclipse.core.runtime.CoreException;

 import org.eclipse.core.runtime.IProgressMonitor;

@@ -34,6 +40,8 @@
 import org.eclipse.emf.common.util.TreeIterator;

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

 import org.eclipse.emf.ecore.EObject;

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

+import org.eclipse.emf.ecore.EPackage.Registry;

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

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

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

@@ -50,6 +58,7 @@
 import org.eclipse.modisco.infra.discovery.benchmark.core.internal.reporting.internal.BenchmarkChartGeneration;

 import org.eclipse.modisco.infra.discovery.benchmark.metamodel.internal.benchmark.Benchmark;

 import org.eclipse.modisco.infra.discovery.benchmark.metamodel.internal.benchmark.BenchmarkFactory;

+import org.eclipse.modisco.infra.discovery.benchmark.metamodel.internal.benchmark.BenchmarkPackage;

 import org.eclipse.modisco.infra.discovery.benchmark.metamodel.internal.benchmark.Discovery;

 import org.eclipse.modisco.infra.discovery.benchmark.metamodel.internal.benchmark.DiscoveryIteration;

 import org.eclipse.modisco.infra.discovery.benchmark.metamodel.internal.benchmark.EndEvent;

@@ -181,9 +190,9 @@
 				setLaunchParameter(disco, discoverer);

 				String serializationLocation;

 				if (discoverer.getTargetURI() != null) {

-					serializationLocation = discoverer.getTargetURI().trimFileExtension().toPlatformString(false);

+					serializationLocation = discoverer.getTargetURI().trimFileExtension().toString();

 				} else {

-					serializationLocation = this.getTargetURI().trimFileExtension().toPlatformString(false);

+					serializationLocation = this.getTargetURI().trimFileExtension().toString();

 				}

 				for (int i = 1; i <= this.iterations;  i++) {

 					URI resultSerializationLocation =  URI.createURI(serializationLocation);

@@ -194,28 +203,31 @@
 					if (IEventNotifier.class.isInstance(discoverer)) {

 						((IEventNotifier) discoverer).addListener(this.recorder);

 					}

-

 					progressMonitor.subTask("Project discovery: iteration " + String.valueOf(getIterations()));

 					this.recorder.start();

-

 					try {

 						if (discoverer.isApplicableTo(project)) {

 							IProgressMonitor subProgressMonitor = new SubProgressMonitor(progressMonitor, EIGHT);

 							discoverer.discoverElement(project, subProgressMonitor);

 						} else {

-							MoDiscoLogger.logWarning("Discoverer " + discovererId + " is not applicable on project " + project.getName(),

-									org.eclipse.modisco.infra.discovery.benchmark.core.internal.Activator.getDefault());

+							final String message = String.format(

+									"Discoverer '%s' is not applicable on project '%s'", //$NON-NLS-1$

+									discovererId,

+									project.getName()

+									);

+							MoDiscoLogger.logWarning(

+									message, Activator.getDefault());

 						}

-					} catch (DiscoveryException e) {

+					} catch (Exception e) {

 						failure = true;

 						discoveryErrors.append(e.getStackTrace().toString());

+						final String message = String.format(

+								"Benchmark of discoverer '%s' fails on project '%s'", //$NON-NLS-1$

+								discovererId,

+								project.getName()

+								);

 						MoDiscoLogger.logError(e,

-								"Benchmark of discoverer " + discovererId + " fails on project" + project.getName(), org.eclipse.modisco.infra.discovery.benchmark.core.internal.Activator.getDefault()); //$NON-NLS-1$

-					} catch (ClassCastException e) {

-						failure = true;

-						discoveryErrors.append(e.getStackTrace().toString());

-						MoDiscoLogger.logError(e,

-								"Benchmark of discoverer " + discovererId + " fails on project" + project.getName(), org.eclipse.modisco.infra.discovery.benchmark.core.internal.Activator.getDefault()); //$NON-NLS-1$

+								message, Activator.getDefault());

 					}

 					this.recorder.stop();

 					this.events.addAll(this.recorder.getEvents());

@@ -229,9 +241,7 @@
 						discoveryIteration.setDiscoveryErrors(discoveryErrors.toString());

 					}

 					disco.getIterations().add(discoveryIteration);

-

 				}

-

 				postDiscoveryDiscoInit(disco, discoverer);

 				if (this.isTargetSerializationChosen()) {

 					try {

@@ -285,7 +295,7 @@
 				size++;

 			}

 		} else {

-			MoDiscoLogger.logWarning("Unable to compute the number of element of an unexisting model", Activator.getDefault());

+			MoDiscoLogger.logWarning("Unable to compute the number of element of an unexisting model: "+targetModel.getURI().toString(), Activator.getDefault());

 		}

 		return size;

 	}

@@ -306,34 +316,48 @@
 			targetURI = this.getTargetURI();

 		}

 		if (targetURI == null) {

-			MoDiscoLogger.logWarning("The HTML_REPORT_LOCATION or the TARGET_URI parameter should not be null", Activator.getDefault());

+			MoDiscoLogger.logWarning(

+					"The HTML_REPORT_LOCATION or the TARGET_URI parameter should not be null", //$NON-NLS-1$

+					Activator.getDefault());

 			return;

 		}

-		IContainer location = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(targetURI.path().replace("/resource", ""))).getParent();

-		String locationString = "";

-		if (targetURI == this.getTargetURI()) {

-			locationString = ResourcesPlugin.getWorkspace().getRoot().getLocation().toString() 

-					+ targetURI.trimSegments(1).toString().replace("platform:/resource", "") + "/HTMLReport";

+		final IWorkspace workspace = ResourcesPlugin.getWorkspace();

+		final IWorkspaceRoot wsRoot = workspace.getRoot();

+		java.io.File file = null;

+		IFile iFile = null;

+		String targetUriStr = targetURI.toString();

+		if (targetURI.isPlatformResource()) {

+			final String pathStr = 

+					targetUriStr.replaceAll("platform:/resource", ""); //$NON-NLS-1$//$NON-NLS-2$

+			iFile = wsRoot.getFile(new Path(pathStr));

+			iFile.getLocation().toFile();

+		} else if (targetURI.isFile()) {

+			file = new java.io.File(java.net.URI.create(targetUriStr));

 		} else {

-			locationString = ResourcesPlugin.getWorkspace().getRoot().getLocation().toString() 

-					+ targetURI.toString().replace("platform:/resource", "");

+			final String message = String.format(

+					"The following target URI '%s' is not managed. 'platform:/resource' or 'file:/' are expected.", //$NON-NLS-1$

+					targetURI.toString());

+			throw new IllegalArgumentException(message);

 		}

-		java.net.URI uri = java.net.URI.create(locationString);

-		java.io.File file = new java.io.File(uri.toString());

-

-		ArrayList<Object> arguments = new ArrayList<Object>();

+		final ArrayList<Object> arguments = new ArrayList<Object>();

 		//Generation of the HTML report

 		try {

 			HtmlReport report = new HtmlReport(benchmark, file, arguments);

 			report.doGenerate(null);

 		} catch (Exception e) {

-			MoDiscoLogger.logWarning(e, "Acceleo exception", org.eclipse.modisco.infra.discovery.benchmark.core.internal.Activator.getDefault());

+			MoDiscoLogger.logWarning(e,

+					"Acceleo exception", //$NON-NLS-1$

+					Activator.getDefault());

 		}

 		//Generation of the charts

-		BenchmarkChartGeneration chartGenerator = new BenchmarkChartGeneration(file, this.measureMemoryUse);

+		final BenchmarkChartGeneration chartGenerator = 

+				new BenchmarkChartGeneration(file, this.measureMemoryUse);

 		chartGenerator.generateAll(benchmark);

 

-		location.refreshLocal(IResource.DEPTH_INFINITE, progressMonitor);

+		if (iFile != null) {

+			final IContainer location = iFile.getParent();

+			location.refreshLocal(IResource.DEPTH_INFINITE, progressMonitor);

+		}

 	}

 

 	/**

diff --git a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/reporting/HtmlReport.java b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/reporting/HtmlReport.java
index 79c9b89..831649f 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/reporting/HtmlReport.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/reporting/HtmlReport.java
@@ -8,6 +8,7 @@
  * Contributors:
  *     Obeo - initial API and implementation
  *     Guillaume Doux - INRIA
+ *     Grégoire Dupé (Mia-Software) - Bug 482857 - Discoverer Benchmark Report : wrong namespaces
  *******************************************************************************/
 package org.eclipse.modisco.infra.discovery.benchmark.core.internal.reporting;
 
@@ -36,7 +37,7 @@
      *
      * @generated
      */
-    public static final String MODULE_FILE_NAME = "/org/eclipse/modisco/infra/discovery/benchmark/reporting/HtmlReport";
+    public static final String MODULE_FILE_NAME = "/org/eclipse/modisco/infra/discovery/benchmark/core/internal/reporting/HtmlReport";
     
     /**
      * The name of the templates that are to be generated.
@@ -130,6 +131,13 @@
                 List<String> arguments = new ArrayList<String>();
                 
                 /*
+                 * If you want to change the content of this method, do NOT forget to change the "@generated"
+                 * tag in the Javadoc of this method to "@generated NOT". Without this new tag, any compilation
+                 * of the Acceleo module with the main template that has caused the creation of this class will
+                 * revert your modifications.
+                 */
+
+                /*
                  * Add in this list all the arguments used by the starting point of the generation
                  * If your main template is called on an element of your model and a String, you can
                  * add in "arguments" this "String" attribute.
@@ -139,14 +147,12 @@
                 
                 /*
                  * Add the properties from the launch arguments.
-                 * If you want to programmatically add new arguments, add them in "propertiesFiles"
+                 * If you want to programmatically add new properties, add them in "propertiesFiles"
                  * You can add the absolute path of a properties files, or even a project relative path.
                  * If you want to add another "protocol" for your properties files, please override 
                  * "getPropertiesLoaderService(AcceleoService)" in order to return a new property loader.
-                 * The basic properties loader will look for properties in the current project if the path
-                 * of the properties file is like this "packagea.packageb.packagec.default" for a properties
-                 * file named default.properties, or if the path is an absolute path. With a new property
-                 * loader you could for example, look for properties files in a bundle.
+                 * The behavior of the properties loader service is explained in the Acceleo documentation
+                 * (Help -> Help Contents).
                  */
                  
                 for (int i = 2; i < args.length; i++) {
@@ -183,6 +189,11 @@
 
         //org.eclipse.emf.ecore.util.EcoreUtil.resolveAll(model);
 
+        /*
+         * If you want to check for potential errors in your models before the launch of the generation, you
+         * use the code below.
+         */
+
         //if (model != null && model.eResource() != null) {
         //    List<org.eclipse.emf.ecore.resource.Resource.Diagnostic> errors = model.eResource().getErrors();
         //    for (org.eclipse.emf.ecore.resource.Resource.Diagnostic diagnostic : errors) {
@@ -261,13 +272,38 @@
     @Override
     public List<String> getProperties() {
         /*
+         * If you want to change the content of this method, do NOT forget to change the "@generated"
+         * tag in the Javadoc of this method to "@generated NOT". Without this new tag, any compilation
+         * of the Acceleo module with the main template that has caused the creation of this class will
+         * revert your modifications.
+         */
+
+        /*
          * TODO if your generation module requires access to properties files, add their qualified path to the list here.
-         * Properties files are expected to be in source folders, and the path here to be the qualified path as if referring
-         * to a Java class. For example, if you have a file named "messages.properties" in package "org.eclipse.acceleo.sample",
-         * the path that needs be added to this list is "org.eclipse.acceleo.sample.messages". If you want to change the content
-         * of this method, do NOT forget to change the "@generated" tag in the Javadoc of this method to "@generated NOT".
-         * Without this new tag, any compilation of the Acceleo module with the main template that has caused the creation of 
-         * this class will revert your modifications.
+         * 
+         * Properties files can be located in an Eclipse plug-in or in the file system (all Acceleo projects are Eclipse
+         * plug-in). In order to use properties files located in an Eclipse plugin, you need to add the path of the properties
+         * files to the "propertiesFiles" list:
+         * 
+         * final String prefix = "platform:/plugin/";
+         * final String pluginName = "org.eclipse.acceleo.module.sample";
+         * final String packagePath = "/org/eclipse/acceleo/module/sample/properties/";
+         * final String fileName = "default.properties";
+         * propertiesFiles.add(prefix + pluginName + packagePath + fileName);
+         * 
+         * With this mechanism, you can load properties files from your plugin or from another plugin.
+         * 
+         * You may want to load properties files from the file system, for that you need to add the absolute path of the file:
+         * 
+         * propertiesFiles.add("C:\Users\MyName\MyFile.properties");
+         * 
+         * If you want to let your users add properties files located in the same folder as the model:
+         *
+         * if (EMFPlugin.IS_ECLIPSE_RUNNING && model != null && model.eResource() != null) { 
+         *     propertiesFiles.addAll(AcceleoEngineUtils.getPropertiesFilesNearModel(model.eResource()));
+         * }
+         * 
+         * To learn more about Properties Files, have a look at the Acceleo documentation (Help -> Help Contents).
          */
         return propertiesFiles;
     }
@@ -317,23 +353,37 @@
             resourceSet.getPackageRegistry().put(org.eclipse.modisco.infra.discovery.launch.LaunchPackage.eINSTANCE.getNsURI(), org.eclipse.modisco.infra.discovery.launch.LaunchPackage.eINSTANCE);
         }
         */
+        
         /*
-         * TODO If you need additional package registrations, you can register them here. The following line
-         * (in comment) is an example of the package registration for UML. If you want to change the content
-         * of this method, do NOT forget to change the "@generated" tag in the Javadoc of this method to
-         * "@generated NOT". Without this new tag, any compilation of the Acceleo module with the main template
-         * that has caused the creation of this class will revert your modifications. You can use the method
-         * "isInWorkspace(Class c)" to check if the package that you are about to register is in the workspace.
-         * To register a package properly, please follow the following conventions:
+         * If you want to change the content of this method, do NOT forget to change the "@generated"
+         * tag in the Javadoc of this method to "@generated NOT". Without this new tag, any compilation
+         * of the Acceleo module with the main template that has caused the creation of this class will
+         * revert your modifications.
+         */
+        
+        /*
+         * If you need additional package registrations, you can register them here. The following line
+         * (in comment) is an example of the package registration for UML.
          * 
+         * You can use the method  "isInWorkspace(Class c)" to check if the package that you are about to
+         * register is in the workspace.
+         * 
+         * To register a package properly, please follow the following conventions:
+         *
+         * If the package is located in another plug-in, already installed in Eclipse. The following content should
+         * have been generated at the beginning of this method. Do not register the package using this mechanism if
+         * the metamodel is located in the workspace.
+         *  
          * if (!isInWorkspace(UMLPackage.class)) {
          *     // The normal package registration if your metamodel is in a plugin.
          *     resourceSet.getPackageRegistry().put(UMLPackage.eNS_URI, UMLPackage.eINSTANCE);
-         * } else {
-         *     // The package registration that will be used if the metamodel is not deployed in a plugin.
-         *     // This should be used if your metamodel is in your workspace and if you are using binary resource serialization.
-         *     resourceSet.getPackageRegistry().put("/myproject/myfolder/mysubfolder/MyUMLMetamodel.ecore", UMLPackage.eINSTANCE);
          * }
+         * 
+         * If the package is located in another project in your workspace, the plugin containing the package has not
+         * been register by EMF and Acceleo should register it automatically. If you want to use the generator in
+         * stand alone, the regular registration (seen a couple lines before) is needed.
+         * 
+         * To learn more about Package Registration, have a look at the Acceleo documentation (Help -> Help Contents).
          */
     }
 
@@ -348,11 +398,19 @@
     public void registerResourceFactories(ResourceSet resourceSet) {
         super.registerResourceFactories(resourceSet);
         /*
+         * If you want to change the content of this method, do NOT forget to change the "@generated"
+         * tag in the Javadoc of this method to "@generated NOT". Without this new tag, any compilation
+         * of the Acceleo module with the main template that has caused the creation of this class will
+         * revert your modifications.
+         */
+        
+        /*
          * TODO If you need additional resource factories registrations, you can register them here. the following line
-         * (in comment) is an example of the resource factory registration for UML. If you want to change the content
-         * of this method, do NOT forget to change the "@generated" tag in the Javadoc of this method to "@generated NOT".
-         * Without this new tag, any compilation of the Acceleo module with the main template that has caused the creation
-         * of this class will revert your modifications. 
+         * (in comment) is an example of the resource factory registration for UML.
+         *
+         * If you want to use the generator in stand alone, the resource factory registration will be required.
+         *  
+         * To learn more about the registration of Resource Factories, have a look at the Acceleo documentation (Help -> Help Contents). 
          */ 
         
         // resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(UMLResource.FILE_EXTENSION, UMLResource.Factory.INSTANCE);
diff --git a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/reporting/HtmlReport.mtl b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/reporting/HtmlReport.mtl
index 1dd5b60..a694c4c 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/reporting/HtmlReport.mtl
+++ b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/reporting/HtmlReport.mtl
@@ -5,15 +5,17 @@
  * Public License v1.0 which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  * 
- * Contributors: Guillaume Doux - INRIA - Initial API and implementation
- * 
+ * Contributors:
+ *    Guillaume Doux (INRIA) - Initial API and implementation
+ *    Grégoire Dupé (Mia-Software) - Bug 482672 - Benchmark command line interface
+ *    Grégoire Dupé (Mia-Software) - Bug 482857 - Discoverer Benchmark Report : wrong namespaces
  ******************************************************************************/ /]
-[module HtmlReport('http://www.eclipse.org/modisco/infra/discovery/0.1.incubation/benchmark','http://www.eclipse.org/MoDisco/Discovery/0.1.incubation/discovery/catalog','http://www.eclipse.org/MoDisco/Discovery/0.1.incubation/discovery/launch')/]
+[module HtmlReport('http://www.eclipse.org/modisco/infra/discovery/benchmark/0.11.incubation/internal/benchmark','http://www.eclipse.org/MoDisco/Discovery/0.1.incubation/discovery/catalog','http://www.eclipse.org/MoDisco/Discovery/0.1.incubation/discovery/launch')/]
 
-[query public maxExecutionTime (iterations : Set(DiscoveryIteration)) : Real = invoke('org.eclipse.modisco.infra.discovery.benchmark.reporting.internal.ReportingUtilities', 'maxExecutionTime(java.util.Collection)', Sequence{iterations})/]
-[query public maxSaveTime (iterations : Set(DiscoveryIteration)) : Real = invoke('org.eclipse.modisco.infra.discovery.benchmark.reporting.internal.ReportingUtilities', 'maxSaveTime(java.util.Collection)', Sequence{iterations})/]
-[query public sizeWithUnit (value : Real) : String = invoke('org.eclipse.modisco.infra.discovery.benchmark.reporting.internal.ReportingUtilities', 'sizeWithUnit(java.lang.Double)', Sequence{value})/]
-[query public timeWithUnit (value : Real) : String = invoke('org.eclipse.modisco.infra.discovery.benchmark.reporting.internal.ReportingUtilities', 'timeWithUnit(java.lang.Double)', Sequence{value})/]
+[query public maxExecutionTime (iterations : Set(DiscoveryIteration)) : Real = invoke('org.eclipse.modisco.infra.discovery.benchmark.core.internal.reporting.internal.ReportingUtilities', 'maxExecutionTime(java.util.Collection)', Sequence{iterations})/]
+[query public maxSaveTime (iterations : Set(DiscoveryIteration)) : Real = invoke('org.eclipse.modisco.infra.discovery.benchmark.core.internal.reporting.internal.ReportingUtilities', 'maxSaveTime(java.util.Collection)', Sequence{iterations})/]
+[query public sizeWithUnit (value : Real) : String = invoke('org.eclipse.modisco.infra.discovery.benchmark.core.internal.reporting.internal.ReportingUtilities', 'sizeWithUnit(java.lang.Double)', Sequence{value})/]
+[query public timeWithUnit (value : Real) : String = invoke('org.eclipse.modisco.infra.discovery.benchmark.core.internal.reporting.internal.ReportingUtilities', 'timeWithUnit(java.lang.Double)', Sequence{value})/]
 
 [template public HtmlReport(b : Benchmark)]
 	
diff --git a/org.eclipse.modisco.infra.discovery.benchmark.doc.archi/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.discovery.benchmark.doc.archi/META-INF/MANIFEST.MF
index ab5cf35..30fb395 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.doc.archi/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.infra.discovery.benchmark.doc.archi/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %Bundle-Name

 Bundle-SymbolicName: org.eclipse.modisco.infra.discovery.benchmark.doc.archi;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-Activator: org.eclipse.modisco.infra.discovery.benchmark.doc.archi.internal.Activator

 Bundle-Vendor: %Bundle-Vendor

 Require-Bundle: org.eclipse.core.runtime

diff --git a/org.eclipse.modisco.infra.discovery.benchmark.feature/feature.xml b/org.eclipse.modisco.infra.discovery.benchmark.feature/feature.xml
index 9add1e4..ef82749 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.feature/feature.xml
+++ b/org.eclipse.modisco.infra.discovery.benchmark.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature

       id="org.eclipse.modisco.infra.discovery.benchmark.feature"

       label="MoDisco Infrastructure Discovery Benchmark (Incubation)"

-      version="0.12.2.qualifier"

+      version="0.13.2.qualifier"

       provider-name="%providerName"

       license-feature="org.eclipse.license"

       license-feature-version="0.0.0">

diff --git a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/META-INF/MANIFEST.MF
index 5a7d842..8d60d3f 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.infra.discovery.benchmark.metamodel;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
diff --git a/org.eclipse.modisco.infra.discovery.benchmark.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.discovery.benchmark.ui/META-INF/MANIFEST.MF
index d6f69d3..b2396a6 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.infra.discovery.benchmark.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.infra.discovery.benchmark.ui;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.infra.discovery.benchmark.ui.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.infra.discovery.benchmark/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.discovery.benchmark/META-INF/MANIFEST.MF
index 66b241e..c460fec 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.infra.discovery.benchmark/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.infra.discovery.benchmark;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.modisco.infra.discovery.core.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.discovery.core.tests/META-INF/MANIFEST.MF
index ad88f66..ee9e8c6 100644
--- a/org.eclipse.modisco.infra.discovery.core.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.infra.discovery.core.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.infra.discovery.core.tests;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.infra.discovery.core.tests.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.infra.discovery.core.tests/src/org/eclipse/modisco/infra/discovery/core/tests/TestDiscoverersReferential.java b/org.eclipse.modisco.infra.discovery.core.tests/src/org/eclipse/modisco/infra/discovery/core/tests/TestDiscoverersReferential.java
index 2eb9a5b..0709f7f 100644
--- a/org.eclipse.modisco.infra.discovery.core.tests/src/org/eclipse/modisco/infra/discovery/core/tests/TestDiscoverersReferential.java
+++ b/org.eclipse.modisco.infra.discovery.core.tests/src/org/eclipse/modisco/infra/discovery/core/tests/TestDiscoverersReferential.java
@@ -7,6 +7,7 @@
  *

  * Contributors:

  *    Fabien Giquel - initial API and implementation

+ *    Gregoire Dupe (Mia-Software) - Bug 453476 - Stop using EMF Facet's deprecated APIs

  *******************************************************************************/

 package org.eclipse.modisco.infra.discovery.core.tests;

 

@@ -19,8 +20,11 @@
 import org.eclipse.core.runtime.NullProgressMonitor;

 import org.eclipse.emf.common.util.EList;

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

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

 import org.eclipse.emf.facet.util.emf.catalog.Catalog;

-import org.eclipse.emf.facet.util.emf.core.ICatalogSetManager;

+import org.eclipse.emf.facet.util.emf.catalog.CatalogSet;

+import org.eclipse.emf.facet.util.emf.core.ICatalogSetManager2;

+import org.eclipse.emf.facet.util.emf.core.ICatalogSetManagerFactory;

 import org.eclipse.modisco.infra.discovery.catalog.DirectionKind;

 import org.eclipse.modisco.infra.discovery.catalog.DiscovererCatalog;

 import org.eclipse.modisco.infra.discovery.catalog.DiscovererDescription;

@@ -44,8 +48,10 @@
 

 		// test discoverers catalog registration

 		boolean catalogFound = false;

-		for (Catalog aCatalog : ICatalogSetManager.INSTANCE.getCatalogSet()

-				.getCatalogs()) {

+		final ICatalogSetManager2 catalogSetManager = ICatalogSetManagerFactory.DEFAULT

+				.createICatalogSetManager(new ResourceSetImpl());

+		final CatalogSet catalogSet = catalogSetManager.getCatalogSet();

+		for (Catalog aCatalog : catalogSet.getCatalogs()) {

 			if (aCatalog instanceof DiscovererCatalog) {

 				catalogFound = true;

 

diff --git a/org.eclipse.modisco.infra.discovery.core/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.discovery.core/META-INF/MANIFEST.MF
index e206fdf..9953011 100644
--- a/org.eclipse.modisco.infra.discovery.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.infra.discovery.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.infra.discovery.core;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.infra.discovery.core.internal.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.infra.discovery.core/src/org/eclipse/modisco/infra/discovery/core/Messages.java b/org.eclipse.modisco.infra.discovery.core/src/org/eclipse/modisco/infra/discovery/core/Messages.java
index 2c22452..53b6c23 100644
--- a/org.eclipse.modisco.infra.discovery.core/src/org/eclipse/modisco/infra/discovery/core/Messages.java
+++ b/org.eclipse.modisco.infra.discovery.core/src/org/eclipse/modisco/infra/discovery/core/Messages.java
@@ -14,6 +14,11 @@
 

 import org.eclipse.osgi.util.NLS;

 

+/**

+* @deprecated Will be removed,

+*             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470701

+*/

+@Deprecated

 public class Messages extends NLS {

 	private static final String BUNDLE_NAME = "org.eclipse.modisco.infra.discovery.core.messages"; //$NON-NLS-1$

 	public static String AbstractDiscoverer_CannotCheck;

diff --git a/org.eclipse.modisco.infra.discovery.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.discovery.ui.tests/META-INF/MANIFEST.MF
index 6b882b4..c0972b9 100644
--- a/org.eclipse.modisco.infra.discovery.ui.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.infra.discovery.ui.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.infra.discovery.ui.tests;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.infra.discovery.ui.tests.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.infra.discovery.ui.tests/src/org/eclipse/modisco/infra/discovery/ui/tests/Activator.java b/org.eclipse.modisco.infra.discovery.ui.tests/src/org/eclipse/modisco/infra/discovery/ui/tests/Activator.java
index b6b1e68..7c9cfee 100644
--- a/org.eclipse.modisco.infra.discovery.ui.tests/src/org/eclipse/modisco/infra/discovery/ui/tests/Activator.java
+++ b/org.eclipse.modisco.infra.discovery.ui.tests/src/org/eclipse/modisco/infra/discovery/ui/tests/Activator.java
@@ -13,6 +13,10 @@
 import org.osgi.framework.BundleActivator;

 import org.osgi.framework.BundleContext;

 

+/**

+ * @deprecated Will become internal cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470609

+ */

+@Deprecated

 public class Activator implements BundleActivator {

 

 	private static BundleContext context;

diff --git a/org.eclipse.modisco.infra.discovery.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.discovery.ui/META-INF/MANIFEST.MF
index 646f27d..68d226f 100644
--- a/org.eclipse.modisco.infra.discovery.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.infra.discovery.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.infra.discovery.ui;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.infra.discovery.ui.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
@@ -17,7 +17,6 @@
  org.eclipse.jdt.core;bundle-version="3.6.0",
  org.eclipse.emf.facet.common.ui;bundle-version="0.1.0",
  org.eclipse.emf.facet.widgets.celleditors;bundle-version="0.1.0",
- org.eclipse.emf.facet.infra.common.core;bundle-version="0.1.0",
  org.eclipse.modisco.infra.discovery;bundle-version="0.9.0",
  org.eclipse.emf.facet.util.emf.ui;bundle-version="0.1.0",
  org.eclipse.emf.facet.util.emf.core;bundle-version="0.1.0",
diff --git a/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/Activator.java b/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/Activator.java
index 6fd41b0..157b088 100644
--- a/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/Activator.java
+++ b/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/Activator.java
@@ -16,7 +16,9 @@
 

 /**

  * The activator class controls the plug-in life cycle

+ * @deprecated Will become internal cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470609

  */

+@Deprecated

 public class Activator extends AbstractUIPlugin {

 

 	// The plug-in ID

diff --git a/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/Messages.java b/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/Messages.java
index 5bf426d..087ac2c 100644
--- a/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/Messages.java
+++ b/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/Messages.java
@@ -12,6 +12,10 @@
 

 import org.eclipse.osgi.util.NLS;

 

+/**

+ * @deprecated Will become internal cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470609

+ */

+@Deprecated

 public class Messages extends NLS {

 	private static final String BUNDLE_NAME = "org.eclipse.modisco.infra.discovery.ui.messages"; //$NON-NLS-1$

 	public static String ContributionItemForMoDiscoMenu_discoverersMenuLabel;

diff --git a/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/celleditors/composite/ComposedCellEditor.java b/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/celleditors/composite/ComposedCellEditor.java
index 713a193..71167ab 100644
--- a/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/celleditors/composite/ComposedCellEditor.java
+++ b/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/celleditors/composite/ComposedCellEditor.java
@@ -8,6 +8,7 @@
  * Contributors:

  *    Fabien Giquel (Mia-Software) - initial API and implementation

  *    Nicolas Bros (Mia-Software)

+ *    Gregoire Dupe (Mia-Software) - Bug 453476 - Stop using EMF Facet's deprecated APIs

  *******************************************************************************/

 package org.eclipse.modisco.infra.discovery.ui.internal.celleditors.composite;

 

@@ -17,7 +18,7 @@
 import org.eclipse.emf.facet.widgets.celleditors.AbstractCellEditorComposite;

 import org.eclipse.emf.facet.widgets.celleditors.ICompositeEditorFactory;

 import org.eclipse.emf.facet.widgets.celleditors.IListener;

-import org.eclipse.emf.facet.widgets.celleditors.IWidget;

+import org.eclipse.emf.facet.widgets.celleditors.IWidget2;

 import org.eclipse.jface.viewers.CellEditor;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.widgets.Composite;

@@ -36,7 +37,7 @@
 

 	@Override

 	protected void doSetValue(final Object value) {

-		((IWidget<Object>) getControl()).setValue(value);

+		((IWidget2<Object>) getControl()).setValue(value);

 	}

 

 	@Override

@@ -46,7 +47,7 @@
 

 	@Override

 	protected Object doGetValue() {

-		return ((IWidget<Object>) getControl()).getValue();

+		return ((IWidget2<Object>) getControl()).getValue();

 	}

 

 	@Override

diff --git a/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/dialogs/ParameterValueEditingSupport.java b/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/dialogs/ParameterValueEditingSupport.java
index a3e84c0..8337ce4 100644
--- a/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/dialogs/ParameterValueEditingSupport.java
+++ b/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/dialogs/ParameterValueEditingSupport.java
@@ -8,11 +8,12 @@
  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

  *    Nicolas Guyomar (Mia-Software) - Bug 339571 - Compilation errors due to EMF Facet API cleaning

+ *    Gregoire Dupe (Mia-Software) - Bug 453476 - Stop using EMF Facet's deprecated APIs

  *******************************************************************************/

 package org.eclipse.modisco.infra.discovery.ui.internal.dialogs;

 

 import org.eclipse.emf.facet.widgets.celleditors.ICompositeEditorFactory;

-import org.eclipse.emf.facet.widgets.celleditors.core.composite.registries.ICompositeEditorFactoriesRegistry;

+import org.eclipse.emf.facet.widgets.celleditors.core.composite.registry.ICompositeEditorFactoriesRegistry;

 import org.eclipse.jface.viewers.CellEditor;

 import org.eclipse.jface.viewers.ColumnViewer;

 import org.eclipse.jface.viewers.EditingSupport;

diff --git a/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/launch/DiscoverersMainTab.java b/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/launch/DiscoverersMainTab.java
index 78ff1fa..dbe59b4 100644
--- a/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/launch/DiscoverersMainTab.java
+++ b/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/launch/DiscoverersMainTab.java
@@ -13,6 +13,7 @@
  *    Nicolas Bros (Mia-Software) - Bug 342824 - SWTException when closing the Discovery launch configuration dialog

  *    Nicolas Bros (Mia-Software) - Bug 342832 - [Discovery] Values lost when clicking anywhere in the launch config dialog

  *    Fabien Giquel (Mia-Software) - Bug 344082 - [Java Discovery] IllegalArgumentException in launch configurations

+ *    Gregoire Dupe (Mia-Software) - Bug 453476 - Stop using EMF Facet's deprecated APIs

  *******************************************************************************/

 package org.eclipse.modisco.infra.discovery.ui.internal.launch;

 

@@ -25,7 +26,7 @@
 import org.eclipse.emf.facet.widgets.celleditors.AbstractCellEditorComposite;

 import org.eclipse.emf.facet.widgets.celleditors.ICompositeEditorFactory;

 import org.eclipse.emf.facet.widgets.celleditors.IListener;

-import org.eclipse.emf.facet.widgets.celleditors.core.composite.registries.ICompositeEditorFactoriesRegistry;

+import org.eclipse.emf.facet.widgets.celleditors.core.composite.registry.ICompositeEditorFactoriesRegistry;

 import org.eclipse.gmt.modisco.infra.common.core.logging.MoDiscoLogger;

 import org.eclipse.modisco.infra.discovery.catalog.DiscovererDescription;

 import org.eclipse.modisco.infra.discovery.catalog.DiscovererParameter;

@@ -147,9 +148,9 @@
 			placeholder.setEnabled(false);

 			placeholder.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false));

 		} else {

-			ICompositeEditorFactory<Object> compositeEditorFactory = (ICompositeEditorFactory<Object>) ICompositeEditorFactoriesRegistry.INSTANCE

-					.getCompositeEditorFactory(discoverer.getSourceType());

-

+			final Class<?> sourceType = discoverer.getSourceType();

+			final ICompositeEditorFactory<Object> compositeEditorFactory = (ICompositeEditorFactory<Object>) ICompositeEditorFactoriesRegistry.INSTANCE

+					.getCompositeEditorFactory(sourceType);

 			if (compositeEditorFactory != null) {

 				this.sourceCellEditorComposite = compositeEditorFactory.createCompositeEditor(

 						this.sourceGroup, SWT.BORDER);

@@ -166,8 +167,7 @@
 				placeholder.setEnabled(false);

 

 				placeholder.setText(NLS.bind(

-						Messages.DiscoverersMainTab_noCellEditorRegisteredForType, discoverer

-								.getSourceType().getName()));

+						Messages.DiscoverersMainTab_noCellEditorRegisteredForType, sourceType.getName()));

 				placeholder.setForeground(Display.getDefault().getSystemColor(SWT.COLOR_DARK_RED));

 			}

 		}

diff --git a/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/launch/parametersdisplay/ParametersTableEditingSupport.java b/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/launch/parametersdisplay/ParametersTableEditingSupport.java
index e22294d..46d8f0d 100644
--- a/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/launch/parametersdisplay/ParametersTableEditingSupport.java
+++ b/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/launch/parametersdisplay/ParametersTableEditingSupport.java
@@ -9,6 +9,7 @@
  *    Gabriel Barbier (Mia-Software) - initial API and implementation

  *    Fabien Giquel (Mia-Software)

  *    Nicolas Guyomar (Mia-Software) - Bug 339571 - Compilation errors due to EMF Facet API cleaning

+ *    Gregoire Dupe (Mia-Software) - Bug 453476 - Stop using EMF Facet's deprecated APIs

  */

 

 package org.eclipse.modisco.infra.discovery.ui.internal.launch.parametersdisplay;

@@ -17,7 +18,7 @@
 import java.util.List;

 

 import org.eclipse.emf.facet.widgets.celleditors.ICompositeEditorFactory;

-import org.eclipse.emf.facet.widgets.celleditors.core.composite.registries.ICompositeEditorFactoriesRegistry;

+import org.eclipse.emf.facet.widgets.celleditors.core.composite.registry.ICompositeEditorFactoriesRegistry;

 import org.eclipse.jface.viewers.CellEditor;

 import org.eclipse.jface.viewers.EditingSupport;

 import org.eclipse.jface.viewers.TableViewer;

diff --git a/org.eclipse.modisco.infra.discovery/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.discovery/META-INF/MANIFEST.MF
index dbde8be..ae5307d 100644
--- a/org.eclipse.modisco.infra.discovery/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.infra.discovery/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.modisco.infra.discovery;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -14,6 +14,5 @@
  org.eclipse.emf.facet.util.emf.catalog;bundle-version="0.1.0",
  org.eclipse.core.resources;bundle-version="3.6.0",
  org.eclipse.gmt.modisco.infra.common.core;bundle-version="0.9.0",
- org.eclipse.emf.facet.infra.common.core;bundle-version="0.1.0",
  org.eclipse.emf.facet.util.emf.core;bundle-version="0.1.0"
 Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.modisco.infra.discoverymanager.tests/.settings/org.eclipse.core.resources.prefs b/org.eclipse.modisco.infra.discoverymanager.tests/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..4824b80
--- /dev/null
+++ b/org.eclipse.modisco.infra.discoverymanager.tests/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1

+encoding/<project>=UTF-8

diff --git a/org.eclipse.modisco.infra.discoverymanager.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.discoverymanager.tests/META-INF/MANIFEST.MF
index ef0956a..ca3c960 100644
--- a/org.eclipse.modisco.infra.discoverymanager.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.infra.discoverymanager.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.infra.discoverymanager.tests
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.infra.discovery.tests.Activator
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.jface;bundle-version="3.6.0",
diff --git a/org.eclipse.modisco.infra.discoverymanager.tests/OSGI-INF/l10n/bundle.properties b/org.eclipse.modisco.infra.discoverymanager.tests/OSGI-INF/l10n/bundle.properties
index ad2b01b..d361cdf 100644
--- a/org.eclipse.modisco.infra.discoverymanager.tests/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.modisco.infra.discoverymanager.tests/OSGI-INF/l10n/bundle.properties
@@ -10,4 +10,4 @@
 ###############################################################################

 #Properties file for org.eclipse.modisco.infra.discoverymanager.tests

 Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = MoDisco discovery manager tests (Incubation)
\ No newline at end of file
+Bundle-Name = MoDisco discovery manager tests (Deprecated) (Incubation)
\ No newline at end of file
diff --git a/org.eclipse.modisco.infra.discoverymanager.tests/src/org/eclipse/modisco/infra/discovery/tests/Activator.java b/org.eclipse.modisco.infra.discoverymanager.tests/src/org/eclipse/modisco/infra/discovery/tests/Activator.java
index 2c0d075..e6f9dd2 100644
--- a/org.eclipse.modisco.infra.discoverymanager.tests/src/org/eclipse/modisco/infra/discovery/tests/Activator.java
+++ b/org.eclipse.modisco.infra.discoverymanager.tests/src/org/eclipse/modisco/infra/discovery/tests/Activator.java
@@ -13,6 +13,10 @@
 import org.osgi.framework.BundleActivator;

 import org.osgi.framework.BundleContext;

 

+/**

+ * @deprecated cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=343840

+ */

+@Deprecated

 public class Activator implements BundleActivator {

 

 	private static BundleContext context;

diff --git a/org.eclipse.modisco.infra.discoverymanager.tests/src/org/eclipse/modisco/infra/discovery/tests/AllTestsInUIThread.java b/org.eclipse.modisco.infra.discoverymanager.tests/src/org/eclipse/modisco/infra/discovery/tests/AllTestsInUIThread.java
index 65213f0..04dea27 100644
--- a/org.eclipse.modisco.infra.discoverymanager.tests/src/org/eclipse/modisco/infra/discovery/tests/AllTestsInUIThread.java
+++ b/org.eclipse.modisco.infra.discoverymanager.tests/src/org/eclipse/modisco/infra/discovery/tests/AllTestsInUIThread.java
@@ -14,6 +14,10 @@
 import org.junit.runners.Suite;

 import org.junit.runners.Suite.SuiteClasses;

 

+/**

+ * @deprecated cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=343840

+ */

+@Deprecated

 @RunWith(Suite.class)

 @SuiteClasses({ BooleanCellEditorTest.class })

 public class AllTestsInUIThread {

diff --git a/org.eclipse.modisco.infra.discoverymanager.tests/src/org/eclipse/modisco/infra/discovery/tests/BooleanCellEditorTest.java b/org.eclipse.modisco.infra.discoverymanager.tests/src/org/eclipse/modisco/infra/discovery/tests/BooleanCellEditorTest.java
index dfee665..1f724cf 100644
--- a/org.eclipse.modisco.infra.discoverymanager.tests/src/org/eclipse/modisco/infra/discovery/tests/BooleanCellEditorTest.java
+++ b/org.eclipse.modisco.infra.discoverymanager.tests/src/org/eclipse/modisco/infra/discovery/tests/BooleanCellEditorTest.java
@@ -7,6 +7,7 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

+ *    Grégoire Dupé (Mia-Software) - Bug 468343 - [Unit Test Failure] org.eclipse.modisco.infra.discovery.tests.BooleanCellEditorTest.testBooleanCellEditor

  *******************************************************************************/

 package org.eclipse.modisco.infra.discovery.tests;

 

@@ -14,12 +15,18 @@
 

 import org.eclipse.swt.widgets.Display;

 import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;

+import org.junit.Ignore;

 import org.junit.Test;

 

+/**

+ * @deprecated cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=343840

+ */

+@Deprecated

 public class BooleanCellEditorTest {

 

 	private static SWTWorkbenchBot bot = new SWTWorkbenchBot();

 

+	@Ignore //Failing test and to complex to fix quickly.

 	@Test

 	public void testBooleanCellEditor() {

 		SWTWorkbenchBot bot = BooleanCellEditorTest.bot;

diff --git a/org.eclipse.modisco.infra.discoverymanager.tests/src/org/eclipse/modisco/infra/discovery/tests/BooleanCellEditorTestDialog.java b/org.eclipse.modisco.infra.discoverymanager.tests/src/org/eclipse/modisco/infra/discovery/tests/BooleanCellEditorTestDialog.java
index 1f94541..2c779aa 100644
--- a/org.eclipse.modisco.infra.discoverymanager.tests/src/org/eclipse/modisco/infra/discovery/tests/BooleanCellEditorTestDialog.java
+++ b/org.eclipse.modisco.infra.discoverymanager.tests/src/org/eclipse/modisco/infra/discovery/tests/BooleanCellEditorTestDialog.java
@@ -30,6 +30,10 @@
 import org.eclipse.swt.widgets.Control;

 import org.eclipse.swt.widgets.Shell;

 

+/**

+ * @deprecated cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=343840

+ */

+@Deprecated

 public class BooleanCellEditorTestDialog extends Dialog {

 

 	protected BooleanCellEditorTestDialog(final Shell parentShell) {

diff --git a/org.eclipse.modisco.infra.doc.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.doc.tests/META-INF/MANIFEST.MF
index 77e5608..4450797 100644
--- a/org.eclipse.modisco.infra.doc.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.infra.doc.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.infra.doc.tests
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.infra.doc.tests.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.infra.facet.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.facet.tests/META-INF/MANIFEST.MF
index 6687726..d4d74a6 100644
--- a/org.eclipse.modisco.infra.facet.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.infra.facet.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %pluginName

 Bundle-SymbolicName: org.eclipse.modisco.infra.facet.tests;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-ClassPath: .

 Bundle-Vendor: %providerName

 Bundle-Localization: plugin

@@ -19,7 +19,9 @@
  org.eclipse.gmt.modisco.infra.facet.core;bundle-version="0.8.0",

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

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

- org.eclipse.jface;bundle-version="3.6.0"

+ org.eclipse.jface;bundle-version="3.6.0",

+ org.eclipse.emf.facet.util.pde.core;bundle-version="1.0.0",

+ org.eclipse.emf.facet.util.core;bundle-version="1.0.0"

 Bundle-ActivationPolicy: lazy

 Bundle-Activator: org.eclipse.modisco.infra.facet.tests.Activator

 Export-Package: org.eclipse.modisco.infra.facet.tests

diff --git a/org.eclipse.modisco.infra.facet.tests/src/org/eclipse/modisco/infra/facet/tests/Activator.java b/org.eclipse.modisco.infra.facet.tests/src/org/eclipse/modisco/infra/facet/tests/Activator.java
index 476f550..675e2be 100644
--- a/org.eclipse.modisco.infra.facet.tests/src/org/eclipse/modisco/infra/facet/tests/Activator.java
+++ b/org.eclipse.modisco.infra.facet.tests/src/org/eclipse/modisco/infra/facet/tests/Activator.java
@@ -16,7 +16,9 @@
 

 /**

  * The activator class controls the plug-in life cycle

+ * @deprecated Will become internal cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470609

  */

+@Deprecated

 public class Activator extends Plugin {

 

 	// The plug-in ID

diff --git a/org.eclipse.modisco.infra.facet.tests/src/org/eclipse/modisco/infra/facet/tests/FacetTests.java b/org.eclipse.modisco.infra.facet.tests/src/org/eclipse/modisco/infra/facet/tests/FacetTests.java
index 2051f7d..181aa04 100644
--- a/org.eclipse.modisco.infra.facet.tests/src/org/eclipse/modisco/infra/facet/tests/FacetTests.java
+++ b/org.eclipse.modisco.infra.facet.tests/src/org/eclipse/modisco/infra/facet/tests/FacetTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2009-2010 Mia-Software.

+ * Copyright (c) 2009, 2015 Mia-Software.

  * 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

@@ -8,6 +8,7 @@
  * Contributors:

  *    Gregoire DUPE (Mia-Software)

  *    Nicolas Bros (Mia-Software)

+ *    Grégoire Dupé (Mia-Software) - Bug 470578 - [Depercated] org.eclipse.gmt.modisco.infra.query

  *******************************************************************************/

 package org.eclipse.modisco.infra.facet.tests;

 

@@ -44,6 +45,8 @@
 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.emf.facet.util.pde.core.internal.exported.TargetPlatformUtils;

+import org.eclipse.emf.facet.util.pde.core.internal.exported.exception.PdeCoreUtilsException;

 import org.eclipse.gmt.modisco.infra.common.core.internal.builder.AbstractMoDiscoCatalog;

 import org.eclipse.gmt.modisco.infra.common.core.internal.builder.EcoreCatalog;

 import org.eclipse.gmt.modisco.infra.common.core.internal.resource.MoDiscoResourceSet;

@@ -64,6 +67,8 @@
 import org.eclipse.gmt.modisco.infra.query.core.ModelQuerySetCatalog;

 import org.eclipse.modisco.infra.query.tests.Utils;

 import org.junit.Assert;

+import org.junit.BeforeClass;

+import org.junit.Ignore;

 import org.junit.Test;

 import org.osgi.framework.Bundle;

 

@@ -73,6 +78,7 @@
  */

 @SuppressWarnings({ "nls" })

 public class FacetTests {

+	private static final int NB_MARKER_GETSUBCLASSES = 6;

 	public static final String FILE_EXT = ".facetSet";

 	public static final String QUERY_EXT = ".querySet";

 

@@ -80,6 +86,11 @@
 	private final EPackage ecorePackage = this.utils.getEcorePackage();

 	private final ResourceSet resourceSet = new ResourceSetImpl();

 

+	@BeforeClass

+	public static void loadTarget() throws PdeCoreUtilsException {

+		TargetPlatformUtils.loadTargetPlatform();

+	}

+	

 	/**

 	 * @return the utils

 	 */

@@ -102,7 +113,7 @@
 				"/src/org/eclipse/modisco/infra/facet/tests/samples/GetSubClasses.java",

 				Activator.getDefault().getBundle());

 		ProjectUtils.refresh(projectToCreate);

-		FileUtils.checkNoMarkerOn(javaFile);

+		FileUtils.checkNoMoreMarkerOn(javaFile, NB_MARKER_GETSUBCLASSES);

 		FileUtils.checkNoMarkerOn(queryFile);

 		FileUtils.checkNoMarkerOn(facetFile);

 		FacetSet facetSet = FacetSetCatalog.getSingleton().getFacetSet(name);

diff --git a/org.eclipse.modisco.infra.omg.doc/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.omg.doc/META-INF/MANIFEST.MF
index eb03867..9bf9b39 100644
--- a/org.eclipse.modisco.infra.omg.doc/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.infra.omg.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %Bundle-Name

 Bundle-SymbolicName: org.eclipse.modisco.infra.omg.doc;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-Vendor: %Bundle-Vendor

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

  org.eclipse.help

diff --git a/org.eclipse.modisco.infra.omg.feature/feature.xml b/org.eclipse.modisco.infra.omg.feature/feature.xml
index a762a8a..9c77bde 100644
--- a/org.eclipse.modisco.infra.omg.feature/feature.xml
+++ b/org.eclipse.modisco.infra.omg.feature/feature.xml
@@ -12,7 +12,7 @@
 <feature

       id="org.eclipse.modisco.infra.omg.feature"

       label="MoDisco OMG meta-models implementations and tools (Incubation)"

-      version="0.12.2.qualifier"

+      version="0.13.2.qualifier"

       provider-name="%providerName"

       license-feature="org.eclipse.license"

       license-feature-version="0.0.0">

diff --git a/org.eclipse.modisco.infra.query.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.query.tests/META-INF/MANIFEST.MF
index 5f43576..38deab4 100644
--- a/org.eclipse.modisco.infra.query.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.infra.query.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.infra.query.tests;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.infra.query.tests.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.gmt.modisco.infra.common.ui;bundle-version="0.6.0",
@@ -11,7 +11,9 @@
  org.eclipse.gmt.modisco.infra.common.core;bundle-version="0.7.0",
  org.eclipse.ui.ide;bundle-version="3.5.0",
  org.junit;bundle-version="4.7.0",
- org.eclipse.core.runtime;bundle-version="3.5.0"
+ org.eclipse.core.runtime;bundle-version="3.5.0",
+ org.eclipse.emf.facet.util.pde.core;bundle-version="1.0.0",
+ org.eclipse.emf.facet.util.core;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.modisco.infra.query.tests,
diff --git a/org.eclipse.modisco.infra.query.tests/src/org/eclipse/modisco/infra/query/tests/Activator.java b/org.eclipse.modisco.infra.query.tests/src/org/eclipse/modisco/infra/query/tests/Activator.java
index 893fdbd..0bdb7ce 100644
--- a/org.eclipse.modisco.infra.query.tests/src/org/eclipse/modisco/infra/query/tests/Activator.java
+++ b/org.eclipse.modisco.infra.query.tests/src/org/eclipse/modisco/infra/query/tests/Activator.java
@@ -16,7 +16,9 @@
 

 /**

  * The activator class controls the plug-in life cycle

+ * @deprecated Will become internal cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470609

  */

+@Deprecated

 public class Activator extends Plugin {

 

 	// The plug-in ID

diff --git a/org.eclipse.modisco.infra.query.tests/src/org/eclipse/modisco/infra/query/tests/UnitTests.java b/org.eclipse.modisco.infra.query.tests/src/org/eclipse/modisco/infra/query/tests/UnitTests.java
index 00d2eb6..65f4f1c 100644
--- a/org.eclipse.modisco.infra.query.tests/src/org/eclipse/modisco/infra/query/tests/UnitTests.java
+++ b/org.eclipse.modisco.infra.query.tests/src/org/eclipse/modisco/infra/query/tests/UnitTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2010 Mia-Software.

+ * Copyright (c) 2010, 2015 Mia-Software.

  * 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

@@ -8,6 +8,7 @@
  * Contributors:

  *    Gregoire DUPE (Mia-Software)

  *    Nicolas Bros (Mia-Software)

+ *    Grégoire Dupé (Mia-Software) - Bug 470578 - [Depercated] org.eclipse.gmt.modisco.infra.query

  *******************************************************************************/

 package org.eclipse.modisco.infra.query.tests;

 

@@ -37,6 +38,9 @@
 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.emf.facet.util.core.DebugUtils;

+import org.eclipse.emf.facet.util.pde.core.internal.exported.TargetPlatformUtils;

+import org.eclipse.emf.facet.util.pde.core.internal.exported.exception.PdeCoreUtilsException;

 import org.eclipse.gmt.modisco.infra.common.core.internal.builder.AbstractMoDiscoCatalog;

 import org.eclipse.gmt.modisco.infra.common.core.internal.utils.FileUtils;

 import org.eclipse.gmt.modisco.infra.common.core.internal.utils.ProjectUtils;

@@ -55,6 +59,8 @@
 import org.eclipse.gmt.modisco.infra.query.runtime.RuntimeFactory;

 import org.eclipse.modisco.infra.query.tests.samples.Bug303036Test003Query;

 import org.junit.Assert;

+import org.junit.BeforeClass;

+import org.junit.Ignore;

 import org.junit.Test;

 

 @SuppressWarnings("nls")

@@ -62,11 +68,18 @@
 

 	private static final String FILE_EXT = ".querySet"; //$NON-NLS-1$

 

+	private static final int NB_MARKERS_Q_FILE = 6;

+

 	private final ResourceSet resourceSet = new ResourceSetImpl();

 

 	private final Utils utils = new Utils(Activator.getDefault());

 	private final EPackage ecorePackage = this.utils.getEcorePackage();

 

+	@BeforeClass

+	public static void loadTarget() throws PdeCoreUtilsException {

+		TargetPlatformUtils.loadTargetPlatform();

+	}

+	

 	@Test

 	public void test001() throws Exception {

 		final String name = "test001"; //$NON-NLS-1$

@@ -80,7 +93,7 @@
 				Activator.getDefault().getBundle());

 		ProjectUtils.refresh(projectToCreate);

 		ModelQuerySetCatalog.getSingleton().waitUntilBuilt();

-		FileUtils.checkNoMarkerOn(javaFile);

+		FileUtils.checkNoMoreMarkerOn(javaFile, NB_MARKERS_Q_FILE);

 		FileUtils.checkNoMarkerOn(file);

 		List<ModelQueryResult> result = executeJavaQuery(name);

 		Assert.assertTrue(((String) result.get(0).getValue()) == "Test001"); //$NON-NLS-1$

@@ -91,7 +104,7 @@
 						projectToCreate,

 						"src/org/eclipse/modisco/infra/query/tests/samples/Test002.java", Activator.getDefault().getBundle()); //$NON-NLS-1$

 		ProjectUtils.refresh(projectToCreate);

-		FileUtils.checkNoMarkerOn(javaFile);

+		FileUtils.checkNoMoreMarkerOn(javaFile, NB_MARKERS_Q_FILE);

 		FileUtils.checkNoMarkerOn(file);

 		List<ModelQueryResult> result2 = executeJavaQuery(name);

 		Assert.assertTrue(((String) result2.get(0).getValue()) == "Test002"); //$NON-NLS-1$

@@ -101,7 +114,7 @@
 						projectToCreate,

 						"src/org/eclipse/modisco/infra/query/tests/samples/Test002.java", Activator.getDefault().getBundle()); //$NON-NLS-1$

 		ProjectUtils.refresh(projectToCreate);

-		FileUtils.checkNoMarkerOn(javaFile);

+		FileUtils.checkNoMoreMarkerOn(javaFile, NB_MARKERS_Q_FILE);

 		FileUtils.checkNoMarkerOn(file);

 		List<ModelQueryResult> result3 = executeJavaQuery(name);

 		Assert.assertTrue(((String) result3.get(0).getValue()) == "Test002bis"); //$NON-NLS-1$

@@ -119,7 +132,7 @@
 				Activator.getDefault().getBundle());

 		ProjectUtils.refresh(projectToCreate);

 		ModelQuerySetCatalog.getSingleton().waitUntilBuilt();

-		FileUtils.checkNoMarkerOn(javaFile);

+		FileUtils.checkNoMoreMarkerOn(javaFile, NB_MARKERS_Q_FILE);

 		FileUtils.checkNoMarkerOn(file);

 		ModelQuerySetCatalog catalog = ModelQuerySetCatalog.getSingleton();

 		ModelQuerySet mqs = catalog.getModelQuerySet(name);

@@ -228,7 +241,7 @@
 				Activator.getDefault().getBundle());

 		ProjectUtils.refresh(projectToCreate);

 		ModelQuerySetCatalog.getSingleton().waitUntilBuilt();

-		FileUtils.checkNoMarkerOn(javaFile);

+		FileUtils.checkNoMoreMarkerOn(javaFile, NB_MARKERS_Q_FILE);

 		FileUtils.checkNoMarkerOn(file);

 		AbstractModelQuery modelQueryInst = null;

 		Assert.assertTrue("Query catalog must not be empty.", //$NON-NLS-1$

@@ -251,7 +264,7 @@
 				Activator.getDefault().getBundle());

 		ProjectUtils.refresh(projectToCreate);

 		ModelQuerySetCatalog.getSingleton().waitUntilBuilt();

-		FileUtils.checkNoMarkerOn(javaFile);

+		FileUtils.checkNoMoreMarkerOn(javaFile, NB_MARKERS_Q_FILE);

 		List<ModelQueryResult> result3 = executeJavaQuery(name);

 		Assert.assertTrue(((String) result3.get(0).getValue()) == "Test002bis"); //$NON-NLS-1$

 		ModelQueryContext context2 = RuntimeFactory.eINSTANCE.createModelQueryContext();

@@ -334,7 +347,7 @@
 				Activator.getDefault().getBundle());

 		ProjectUtils.refresh(projectToCreate);

 		ModelQuerySetCatalog.getSingleton().waitUntilBuilt();

-		FileUtils.checkNoMarkerOn(javaFile);

+		FileUtils.checkNoMoreMarkerOn(javaFile, NB_MARKERS_Q_FILE);

 		FileUtils.checkNoMarkerOn(file);

 		ModelQuerySetCatalog catalog = ModelQuerySetCatalog.getSingleton();

 		ModelQuerySet modelQuerySet = catalog.getModelQuerySet(name);

@@ -539,7 +552,7 @@
 				Activator.getDefault().getBundle());

 		ProjectUtils.refresh(projectToCreate);

 		ModelQuerySetCatalog.getSingleton().waitUntilBuilt();

-		FileUtils.checkNoMarkerOn(javaFile);

+		FileUtils.checkNoMoreMarkerOn(javaFile, NB_MARKERS_Q_FILE);

 		FileUtils.checkNoMarkerOn(file);

 		ModelQuerySet mqs = ModelQuerySetCatalog.getSingleton().getModelQuerySet(name);

 

diff --git a/org.eclipse.modisco.infrastructure.doc.archi/META-INF/MANIFEST.MF b/org.eclipse.modisco.infrastructure.doc.archi/META-INF/MANIFEST.MF
index 006292f..103212c 100644
--- a/org.eclipse.modisco.infrastructure.doc.archi/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.infrastructure.doc.archi/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %Bundle-Name

 Bundle-SymbolicName: org.eclipse.modisco.infrastructure.doc.archi;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-Vendor: %Bundle-Vendor

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

  org.eclipse.help

diff --git a/org.eclipse.modisco.infrastructure.doc/META-INF/MANIFEST.MF b/org.eclipse.modisco.infrastructure.doc/META-INF/MANIFEST.MF
index 607a442..c053f0d 100644
--- a/org.eclipse.modisco.infrastructure.doc/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.infrastructure.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %Bundle-Name

 Bundle-SymbolicName: org.eclipse.modisco.infrastructure.doc;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-Vendor: %Bundle-Vendor

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

  org.eclipse.help

diff --git a/org.eclipse.modisco.infrastructure.feature/feature.xml b/org.eclipse.modisco.infrastructure.feature/feature.xml
index 6235772..02fb6b4 100644
--- a/org.eclipse.modisco.infrastructure.feature/feature.xml
+++ b/org.eclipse.modisco.infrastructure.feature/feature.xml
@@ -12,7 +12,7 @@
 <feature

       id="org.eclipse.modisco.infrastructure.feature"

       label="MoDisco Infrastructure (Incubation)"

-      version="0.12.2.qualifier"

+      version="0.13.2.qualifier"

       provider-name="%providerName"

       plugin="org.eclipse.gmt.modisco.infra.common.core"

       license-feature="org.eclipse.license"

@@ -35,6 +35,10 @@
       %license

    </license>

 

+   <includes

+         id="org.eclipse.modisco.infra.browser.feature"

+         version="0.0.0"/>

+

    <plugin

          id="org.eclipse.gmt.modisco.infra.discoverymanager"

          download-size="0"

diff --git a/org.eclipse.modisco.java.browser.customization.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.java.browser.customization.tests/META-INF/MANIFEST.MF
index 9ab7cb1..fdd5c4b 100644
--- a/org.eclipse.modisco.java.browser.customization.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.java.browser.customization.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.java.browser.customization.tests;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.java.browser.customization.test.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.java.browser.customization.tests/src/org/eclipse/modisco/java/browser/customization/test/Activator.java b/org.eclipse.modisco.java.browser.customization.tests/src/org/eclipse/modisco/java/browser/customization/test/Activator.java
index 7bc5221..b702eba 100644
--- a/org.eclipse.modisco.java.browser.customization.tests/src/org/eclipse/modisco/java/browser/customization/test/Activator.java
+++ b/org.eclipse.modisco.java.browser.customization.tests/src/org/eclipse/modisco/java/browser/customization/test/Activator.java
@@ -15,7 +15,9 @@
 

 /**

  * The activator class controls the plug-in life cycle

+ * @deprecated Will become internal cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470609

  */

+@Deprecated

 public class Activator extends AbstractUIPlugin {

 

 	// The plug-in ID

diff --git a/org.eclipse.modisco.java.browser.customization.tests/src/org/eclipse/modisco/java/browser/customization/test/Tests.java b/org.eclipse.modisco.java.browser.customization.tests/src/org/eclipse/modisco/java/browser/customization/test/Tests.java
index 3a8b8cf..a33ff74 100644
--- a/org.eclipse.modisco.java.browser.customization.tests/src/org/eclipse/modisco/java/browser/customization/test/Tests.java
+++ b/org.eclipse.modisco.java.browser.customization.tests/src/org/eclipse/modisco/java/browser/customization/test/Tests.java
@@ -30,6 +30,7 @@
 import org.eclipse.gmt.modisco.infra.facet.FacetSet;

 import org.eclipse.gmt.modisco.infra.facet.core.FacetSetCatalog;

 import org.junit.Assert;

+import org.junit.Ignore;

 import org.junit.Test;

 

 public class Tests {

@@ -97,6 +98,7 @@
 		Assert.assertNotNull(facet25);

 	}

 

+	@Ignore //cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470350

 	@Test

 	public void bug308991() throws CoreException, IOException,

 			InterruptedException {

diff --git a/org.eclipse.modisco.java.cdo.feature/feature.xml b/org.eclipse.modisco.java.cdo.feature/feature.xml
index ba425de..2b8009a 100644
--- a/org.eclipse.modisco.java.cdo.feature/feature.xml
+++ b/org.eclipse.modisco.java.cdo.feature/feature.xml
@@ -12,7 +12,7 @@
 <feature

       id="org.eclipse.modisco.java.cdo.feature"

       label="MoDisco CDO Java Discoverer feature (Incubation)"

-      version="0.12.2.qualifier"

+      version="0.13.2.qualifier"

       provider-name="%providerName"

       plugin="org.eclipse.gmt.modisco.java.cdo"

       license-feature="org.eclipse.license"

diff --git a/org.eclipse.modisco.java.composition.browser.customization/META-INF/MANIFEST.MF b/org.eclipse.modisco.java.composition.browser.customization/META-INF/MANIFEST.MF
index aafb157..853a58d 100644
--- a/org.eclipse.modisco.java.composition.browser.customization/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.java.composition.browser.customization/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.java.composition.browser.customization;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.java.composition.browser.customization.Activator
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.gmt.modisco.infra.common.core,
diff --git a/org.eclipse.modisco.java.composition.discoverer.benchmark/META-INF/MANIFEST.MF b/org.eclipse.modisco.java.composition.discoverer.benchmark/META-INF/MANIFEST.MF
index 95727b8..100fb60 100644
--- a/org.eclipse.modisco.java.composition.discoverer.benchmark/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.java.composition.discoverer.benchmark/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.java.composition.discoverer.benchmark;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.java.composition.discoverer.benchmark.Activator
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.modisco.java.composition.discoverer;bundle-version="0.0.9",
diff --git a/org.eclipse.modisco.java.composition.discoverer.benchmark/src/org/eclipse/modisco/java/composition/discoverer/benchmark/Benchmark.java b/org.eclipse.modisco.java.composition.discoverer.benchmark/src/org/eclipse/modisco/java/composition/discoverer/benchmark/Benchmark.java
index de40348..2a59210 100644
--- a/org.eclipse.modisco.java.composition.discoverer.benchmark/src/org/eclipse/modisco/java/composition/discoverer/benchmark/Benchmark.java
+++ b/org.eclipse.modisco.java.composition.discoverer.benchmark/src/org/eclipse/modisco/java/composition/discoverer/benchmark/Benchmark.java
@@ -36,6 +36,7 @@
 

 /**

  * This class provides a way to monitor a Java Composition Discovery.

+ * @deprecated cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=474718

  */

 @Deprecated

 public class Benchmark implements Discoverer {

diff --git a/org.eclipse.modisco.java.composition.discoverer.benchmark/src/org/eclipse/modisco/java/composition/discoverer/benchmark/actions/DiscoverJavaApplicationModel.java b/org.eclipse.modisco.java.composition.discoverer.benchmark/src/org/eclipse/modisco/java/composition/discoverer/benchmark/actions/DiscoverJavaApplicationModel.java
index 9bb4e1a..d9f7c5e 100644
--- a/org.eclipse.modisco.java.composition.discoverer.benchmark/src/org/eclipse/modisco/java/composition/discoverer/benchmark/actions/DiscoverJavaApplicationModel.java
+++ b/org.eclipse.modisco.java.composition.discoverer.benchmark/src/org/eclipse/modisco/java/composition/discoverer/benchmark/actions/DiscoverJavaApplicationModel.java
@@ -30,7 +30,8 @@
  * This class extends the DiscoverKDMSourceAndJavaModel to instrument it with benchmark

  * capabilities. Memory used during the discovery and saving steps are reported in an html file

  * 

- * @deprecated use matching org.eclipse.modisco.x.y.z component

+ * @deprecated use matching org.eclipse.modisco.x.y.z component, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=474718

  */

 @Deprecated

 public class DiscoverJavaApplicationModel extends DiscoverKDMSourceAndJavaModel {

diff --git a/org.eclipse.modisco.java.composition.discoverer.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.java.composition.discoverer.tests/META-INF/MANIFEST.MF
index 328648c..ae49b5c 100644
--- a/org.eclipse.modisco.java.composition.discoverer.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.java.composition.discoverer.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.java.composition.discoverer.tests;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.java.composition.discoverer.tests.JUnitPlugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui;bundle-version="3.6.0",
diff --git a/org.eclipse.modisco.java.composition.discoverer.tests/src/org/eclipse/modisco/java/composition/discoverer/tests/compatibility/AllTestsInUIThread.java b/org.eclipse.modisco.java.composition.discoverer.tests/src/org/eclipse/modisco/java/composition/discoverer/tests/compatibility/AllTestsInUIThread.java
index 83ad198..b148895 100644
--- a/org.eclipse.modisco.java.composition.discoverer.tests/src/org/eclipse/modisco/java/composition/discoverer/tests/compatibility/AllTestsInUIThread.java
+++ b/org.eclipse.modisco.java.composition.discoverer.tests/src/org/eclipse/modisco/java/composition/discoverer/tests/compatibility/AllTestsInUIThread.java
@@ -15,6 +15,9 @@
 import org.junit.runners.Suite;

 import org.junit.runners.Suite.SuiteClasses;

 

+/**

+ * @deprecated cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=474718

+ */

 @SuppressWarnings("deprecation")

 @RunWith(Suite.class)

 @Deprecated

diff --git a/org.eclipse.modisco.java.composition.discoverer.tests/src/org/eclipse/modisco/java/composition/discoverer/tests/compatibility/CompositeDiscoveryTests.java b/org.eclipse.modisco.java.composition.discoverer.tests/src/org/eclipse/modisco/java/composition/discoverer/tests/compatibility/CompositeDiscoveryTests.java
index b3a8990..6de62d8 100644
--- a/org.eclipse.modisco.java.composition.discoverer.tests/src/org/eclipse/modisco/java/composition/discoverer/tests/compatibility/CompositeDiscoveryTests.java
+++ b/org.eclipse.modisco.java.composition.discoverer.tests/src/org/eclipse/modisco/java/composition/discoverer/tests/compatibility/CompositeDiscoveryTests.java
@@ -34,7 +34,7 @@
 

 /**

  * @author GBarbier

- * 

+ * @deprecated cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=474718

  */

 @Deprecated

 public class CompositeDiscoveryTests {

diff --git a/org.eclipse.modisco.java.composition.discoverer.tests/src/org/eclipse/modisco/java/composition/discoverer/tests/compatibility/StrategySourceJavaTests.java b/org.eclipse.modisco.java.composition.discoverer.tests/src/org/eclipse/modisco/java/composition/discoverer/tests/compatibility/StrategySourceJavaTests.java
index 930edfc..cb6124c 100644
--- a/org.eclipse.modisco.java.composition.discoverer.tests/src/org/eclipse/modisco/java/composition/discoverer/tests/compatibility/StrategySourceJavaTests.java
+++ b/org.eclipse.modisco.java.composition.discoverer.tests/src/org/eclipse/modisco/java/composition/discoverer/tests/compatibility/StrategySourceJavaTests.java
@@ -38,7 +38,7 @@
 

 /**

  * @author GBarbier

- * 

+ * @deprecated cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=474718

  */

 @Deprecated

 public class StrategySourceJavaTests {

diff --git a/org.eclipse.modisco.java.composition.discoverer.tests/src/org/eclipse/modisco/java/composition/discoverer/tests/compatibility/TestJavaApp.java b/org.eclipse.modisco.java.composition.discoverer.tests/src/org/eclipse/modisco/java/composition/discoverer/tests/compatibility/TestJavaApp.java
index d5cd789..6da8f69 100644
--- a/org.eclipse.modisco.java.composition.discoverer.tests/src/org/eclipse/modisco/java/composition/discoverer/tests/compatibility/TestJavaApp.java
+++ b/org.eclipse.modisco.java.composition.discoverer.tests/src/org/eclipse/modisco/java/composition/discoverer/tests/compatibility/TestJavaApp.java
@@ -50,6 +50,9 @@
 import org.junit.Test;

 import org.osgi.framework.Bundle;

 

+/**

+ * @deprecated cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=474718

+ */

 @Deprecated

 public class TestJavaApp {

 

diff --git a/org.eclipse.modisco.java.composition.discoverer.tests/src/org/eclipse/modisco/java/composition/discoverer/tests/compatibility/TestMemoryUsage.java b/org.eclipse.modisco.java.composition.discoverer.tests/src/org/eclipse/modisco/java/composition/discoverer/tests/compatibility/TestMemoryUsage.java
index 81b5082..c69a267 100644
--- a/org.eclipse.modisco.java.composition.discoverer.tests/src/org/eclipse/modisco/java/composition/discoverer/tests/compatibility/TestMemoryUsage.java
+++ b/org.eclipse.modisco.java.composition.discoverer.tests/src/org/eclipse/modisco/java/composition/discoverer/tests/compatibility/TestMemoryUsage.java
@@ -47,6 +47,9 @@
 import org.junit.Test;

 import org.osgi.framework.Bundle;

 

+/**

+ * @deprecated cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=474718

+ */

 @Deprecated

 public class TestMemoryUsage {

 

diff --git a/org.eclipse.modisco.java.composition.discoverer.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.java.composition.discoverer.ui/META-INF/MANIFEST.MF
index edd9e3d..f21040c 100644
--- a/org.eclipse.modisco.java.composition.discoverer.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.java.composition.discoverer.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.java.composition.discoverer.ui;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.java.composition.discoverer.ui.internal.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.modisco.java.composition.discoverer/META-INF/MANIFEST.MF b/org.eclipse.modisco.java.composition.discoverer/META-INF/MANIFEST.MF
index a6a0c26..73974b9 100644
--- a/org.eclipse.modisco.java.composition.discoverer/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.java.composition.discoverer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.java.composition.discoverer;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.java.composition.discoverer.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
@@ -17,7 +17,8 @@
  org.eclipse.modisco.infra.discovery.core;bundle-version="0.9.0",
  org.eclipse.gmt.modisco.java.discoverer;bundle-version="0.9.0",
  org.eclipse.gmt.modisco.infra.discoverymanager;bundle-version="0.9.0",
- org.eclipse.gmt.modisco.kdm.source.discoverer;bundle-version="0.9.0"
+ org.eclipse.gmt.modisco.kdm.source.discoverer;bundle-version="0.9.0",
+ org.eclipse.emf.facet.util.core;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.modisco.java.composition.discoverer
diff --git a/org.eclipse.modisco.java.composition.discoverer/OSGI-INF/l10n/bundle.properties b/org.eclipse.modisco.java.composition.discoverer/OSGI-INF/l10n/bundle.properties
index 53abf8b..27ec6d1 100644
--- a/org.eclipse.modisco.java.composition.discoverer/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.modisco.java.composition.discoverer/OSGI-INF/l10n/bundle.properties
@@ -8,6 +8,6 @@
 # Contributors:

 #     Nicolas Guyomar (Mia-Software) - initial API and implementation

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

-discoverer.name = Discover Java and Inventory model from Java project...

+discoverer.name = Discover Java and Inventory model from Java project... (Deprecated)

 Bundle-Vendor = Eclipse Modeling Project

 Bundle-Name = MoDisco Java Composition Discoverer (Incubation)
\ No newline at end of file
diff --git a/org.eclipse.modisco.java.composition.discoverer/src/org/eclipse/modisco/java/composition/discoverer/Activator.java b/org.eclipse.modisco.java.composition.discoverer/src/org/eclipse/modisco/java/composition/discoverer/Activator.java
index da19835..e7b1d32 100644
--- a/org.eclipse.modisco.java.composition.discoverer/src/org/eclipse/modisco/java/composition/discoverer/Activator.java
+++ b/org.eclipse.modisco.java.composition.discoverer/src/org/eclipse/modisco/java/composition/discoverer/Activator.java
@@ -18,7 +18,9 @@
 

 /**

  * The activator class controls the plug-in life cycle

+ * @deprecated Will become internal cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470609

  */

+@Deprecated

 public class Activator extends AbstractUIPlugin {

 

 	// The plug-in ID

diff --git a/org.eclipse.modisco.java.composition.discoverer/src/org/eclipse/modisco/java/composition/discoverer/DiscoverKDMSourceAndJavaModel.java b/org.eclipse.modisco.java.composition.discoverer/src/org/eclipse/modisco/java/composition/discoverer/DiscoverKDMSourceAndJavaModel.java
index 89cc94f..abcc789 100644
--- a/org.eclipse.modisco.java.composition.discoverer/src/org/eclipse/modisco/java/composition/discoverer/DiscoverKDMSourceAndJavaModel.java
+++ b/org.eclipse.modisco.java.composition.discoverer/src/org/eclipse/modisco/java/composition/discoverer/DiscoverKDMSourceAndJavaModel.java
@@ -70,7 +70,8 @@
  * See Help contents or http://wiki.eclipse.org/MoDisco/Components/Java/Composition

  *

  * @deprecated use {@link DiscoverKDMSourceAndJavaModelFromProject} or

- *             {@link DiscoverKDMSourceAndJavaModelFromJavaProject}

+ *             {@link DiscoverKDMSourceAndJavaModelFromJavaProject},

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=474718

  *

  */

 @Deprecated

diff --git a/org.eclipse.modisco.java.composition.discoverer/src/org/eclipse/modisco/java/composition/discoverer/DiscoverKDMSourceAndJavaModelFromProject.java b/org.eclipse.modisco.java.composition.discoverer/src/org/eclipse/modisco/java/composition/discoverer/DiscoverKDMSourceAndJavaModelFromProject.java
index e7a6fbe..b546464 100644
--- a/org.eclipse.modisco.java.composition.discoverer/src/org/eclipse/modisco/java/composition/discoverer/DiscoverKDMSourceAndJavaModelFromProject.java
+++ b/org.eclipse.modisco.java.composition.discoverer/src/org/eclipse/modisco/java/composition/discoverer/DiscoverKDMSourceAndJavaModelFromProject.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Mia-Software.

+ * Copyright (c) 2011, 2015 Mia-Software.

  * 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

@@ -7,10 +7,13 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - Bug 335003 - [Discoverer] : Existing Discoverers Refactoring based on new framework

+ *    Grégoire Dupé (Mia-Software) - Bug 472194 - DiscoveryException in AbstractDiscoverer.discoverElement (70)

  *******************************************************************************/

 package org.eclipse.modisco.java.composition.discoverer;

 

 import org.eclipse.core.resources.IProject;

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

+import org.eclipse.emf.facet.util.core.Logger;

 import org.eclipse.jdt.core.JavaCore;

 import org.eclipse.modisco.infra.discovery.core.annotations.ParameterInitialValue;

 import org.eclipse.modisco.java.discoverer.AbstractDiscoverJavaModelFromProject;

@@ -30,7 +33,17 @@
 		AbstractDiscoverKDMSourceAndJavaModel<IProject> {

 

 	public boolean isApplicableTo(final IProject source) {

-		return source.isAccessible();

+		boolean isJavaProject = false;

+		try {

+			isJavaProject = source.hasNature(JavaCore.NATURE_ID);

+		} catch (CoreException e) {

+			final String messages = String.format(

+					"Something wrong happend when testing the nature of %s. We assum that this project is not a JDT (Java) project.", //$NON-NLS-1$

+					source.getName()

+				);

+			Logger.logError(e, messages, Activator.getDefault());

+		}

+		return source.isAccessible() && isJavaProject;

 	}

 

 	@Override

diff --git a/org.eclipse.modisco.java.composition.discoverer/src/org/eclipse/modisco/java/composition/discoverer/Messages.java b/org.eclipse.modisco.java.composition.discoverer/src/org/eclipse/modisco/java/composition/discoverer/Messages.java
index 14dd8dc..91341f0 100644
--- a/org.eclipse.modisco.java.composition.discoverer/src/org/eclipse/modisco/java/composition/discoverer/Messages.java
+++ b/org.eclipse.modisco.java.composition.discoverer/src/org/eclipse/modisco/java/composition/discoverer/Messages.java
@@ -15,6 +15,11 @@
 

 import org.eclipse.osgi.util.NLS;

 

+/**

+ * @deprecated Will be removed,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470701

+ */

+@Deprecated

 public class Messages extends NLS {

 	private static final String BUNDLE_NAME = "org.eclipse.modisco.java.composition.discoverer.messages"; //$NON-NLS-1$

 	public static String DiscoverKDMSourceAndJavaModel_0;

diff --git a/org.eclipse.modisco.java.composition.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.java.composition.ui/META-INF/MANIFEST.MF
index df3b713..20941db 100644
--- a/org.eclipse.modisco.java.composition.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.java.composition.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.java.composition.ui;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.java.composition.ui.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.ide;bundle-version="3.6.0",
diff --git a/org.eclipse.modisco.java.composition/META-INF/MANIFEST.MF b/org.eclipse.modisco.java.composition/META-INF/MANIFEST.MF
index ee848d1..0bb53d9 100644
--- a/org.eclipse.modisco.java.composition/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.java.composition/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@
  fra.query.core;bundle-version="0.9.0"
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ClassPath: .
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.modisco.java.composition;singleton:=true
diff --git a/org.eclipse.modisco.java.discoverer.benchmark.feature/feature.xml b/org.eclipse.modisco.java.discoverer.benchmark.feature/feature.xml
index 57f2a78..e13b139 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark.feature/feature.xml
+++ b/org.eclipse.modisco.java.discoverer.benchmark.feature/feature.xml
@@ -12,7 +12,7 @@
 <feature

       id="org.eclipse.modisco.java.discoverer.benchmark.feature"

       label="MoDisco Java Discoverer Benchmark feature (Incubation)"

-      version="0.12.2.qualifier"

+      version="0.13.2.qualifier"

       provider-name="%providerName"

       plugin="org.eclipse.gmt.modisco.java.discoverer.benchmark"

       license-feature="org.eclipse.license"

diff --git a/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/META-INF/MANIFEST.MF b/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/META-INF/MANIFEST.MF
index ef4775c..2e288f5 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %Bundle-Name

 Bundle-SymbolicName: org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-ClassPath: .

 Bundle-Vendor: %Bundle-Vendor

 Bundle-Localization: OSGI-INF/l10n/bundle

diff --git a/org.eclipse.modisco.java.discoverer.benchmark.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.java.discoverer.benchmark.tests/META-INF/MANIFEST.MF
index 96c86b1..5583c47 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.java.discoverer.benchmark.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.java.discoverer.benchmark.tests
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.java.discoverer.benchmark.tests.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.modisco.java.discoverer.benchmark.tests/src/org/eclipse/modisco/java/discoverer/benchmark/tests/JavaDiscovererBenchmarkTest.java b/org.eclipse.modisco.java.discoverer.benchmark.tests/src/org/eclipse/modisco/java/discoverer/benchmark/tests/JavaDiscovererBenchmarkTest.java
index 69e225a..bb5d09c 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark.tests/src/org/eclipse/modisco/java/discoverer/benchmark/tests/JavaDiscovererBenchmarkTest.java
+++ b/org.eclipse.modisco.java.discoverer.benchmark.tests/src/org/eclipse/modisco/java/discoverer/benchmark/tests/JavaDiscovererBenchmarkTest.java
@@ -10,6 +10,7 @@
  *    Fabien Giquel (Mia-Software) - Bug 339720 : MoDisco Discoverers (infra + techno) API clean

  *    Nicolas Bros (Mia-Software) - Bug 335003 - [Discoverer] : Existing Discoverers Refactoring based on new framework

  *    Gregoire Dupe (Mia-Software) - Bug 346087 - Regression of the report of the Java discoverer benchmark

+ *    Gregoire Dupe (Mia-Software) - Bug 511745 - [Unit Test Failure] org.eclipse.modisco.java.discoverer.benchmark.tests.JavaDiscovererBenchmarkTest.test001

  *******************************************************************************/

 package org.eclipse.modisco.java.discoverer.benchmark.tests;

 

@@ -57,7 +58,7 @@
 		AcceleoEnginePlugin.getDefault().getLog().addLogListener(this.listener);

 	}

 

-	@Test(timeout = 15 * 60 * 1000)

+	@Test(timeout = 25 * 60 * 1000)

 	public void test001() throws CoreException, IOException {

 		if (Boolean.parseBoolean(System.getenv().get("skip.long.junit.tests"))) {

 			throw new RuntimeException("skipped");

diff --git a/org.eclipse.modisco.java.discoverer.benchmark/.externalToolBuilders/emtlCopy.launch b/org.eclipse.modisco.java.discoverer.benchmark/.externalToolBuilders/emtlCopy.launch
deleted file mode 100644
index 8d8494a..0000000
--- a/org.eclipse.modisco.java.discoverer.benchmark/.externalToolBuilders/emtlCopy.launch
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">

-<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>

-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>

-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/>

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

-<listEntry value="/org.eclipse.gmt.modisco.java.discoverer.benchmark"/>

-</listAttribute>

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

-<listEntry value="4"/>

-</listAttribute>

-<booleanAttribute key="org.eclipse.debug.core.capture_output" value="false"/>

-<booleanAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_OUTPUT_ON" value="false"/>

-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="true"/>

-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>

-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.modisco.java.discoverer.benchmark"/>

-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/>

-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;resources&gt;&#13;&#10;&lt;item path=&quot;/org.eclipse.modisco.java.discoverer.benchmark/bin&quot; type=&quot;2&quot;/&gt;&#13;&#10;&lt;/resources&gt;}"/>

-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.modisco.java.discoverer.benchmark/emtlCopy.build.xml}"/>

-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>

-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>

-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.modisco.java.discoverer.benchmark}"/>

-</launchConfiguration>

diff --git a/org.eclipse.modisco.java.discoverer.benchmark/.project b/org.eclipse.modisco.java.discoverer.benchmark/.project
index 407005a..ce0eb07 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark/.project
+++ b/org.eclipse.modisco.java.discoverer.benchmark/.project
@@ -26,46 +26,10 @@
 			</arguments>

 		</buildCommand>

 		<buildCommand>

-			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>

-			<triggers>auto,full,incremental,</triggers>

-			<arguments>

-				<dictionary>

-					<key>LaunchConfigHandle</key>

-					<value>&lt;project&gt;/.externalToolBuilders/emtlCopy.launch</value>

-				</dictionary>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

 			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>

 			<arguments>

 			</arguments>

 		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.buckminster.ant.AntBuilder</name>

-			<triggers>auto,full,incremental,</triggers>

-			<arguments>

-				<dictionary>

-					<key>auto.kind.target</key>

-					<value>emtlCopyBack</value>

-				</dictionary>

-				<dictionary>

-					<key>build.result.folder</key>

-					<value>.</value>

-				</dictionary>

-				<dictionary>

-					<key>full.kind.target</key>

-					<value>emtlCopyBack</value>

-				</dictionary>

-				<dictionary>

-					<key>incremental.kind.target</key>

-					<value>emtlCopyBack</value>

-				</dictionary>

-				<dictionary>

-					<key>script.file</key>

-					<value>emtlCopy.build.xml</value>

-				</dictionary>

-			</arguments>

-		</buildCommand>

 	</buildSpec>

 	<natures>

 		<nature>org.eclipse.acceleo.ide.ui.acceleoNature</nature>

diff --git a/org.eclipse.modisco.java.discoverer.benchmark/META-INF/MANIFEST.MF b/org.eclipse.modisco.java.discoverer.benchmark/META-INF/MANIFEST.MF
index 5f37867..14fea1d 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.java.discoverer.benchmark/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.java.discoverer.benchmark;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.java.discoverer.benchmark.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.gmt.modisco.java;bundle-version="0.7.0",
diff --git a/org.eclipse.modisco.java.discoverer.benchmark/emtl/org/eclipse/modisco/java/discoverer/benchmark/template/html/htmlReport.emtl b/org.eclipse.modisco.java.discoverer.benchmark/emtl/org/eclipse/modisco/java/discoverer/benchmark/template/html/htmlReport.emtl
deleted file mode 100644
index 2bdb079..0000000
--- a/org.eclipse.modisco.java.discoverer.benchmark/emtl/org/eclipse/modisco/java/discoverer/benchmark/template/html/htmlReport.emtl
+++ /dev/null
@@ -1,2072 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:mtl="http://www.eclipse.org/acceleo/mtl/3.0" xmlns:ocl.ecore="http://www.eclipse.org/ocl/1.1.0/Ecore">

-  <mtl:Module name="htmlReport" nsURI="org::eclipse::modisco::java::discoverer::benchmark::template::html::htmlReport" startHeaderPosition="470" endHeaderPosition="616">

-    <input>

-      <takesTypesFrom href="http://www.eclipse.org/MoDisco/JavaBenchmark/0.9.0/javaBenchmark#/"/>

-    </input>

-    <input>

-      <takesTypesFrom href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#/"/>

-    </input>

-    <ownedModuleElement xsi:type="mtl:Template" name="htmlReport" visibility="Public" main="true">

-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#x9;&#xA;"/>

-      <body xsi:type="mtl:FileBlock" openMode="OverWrite">

-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;html>&#xA;&lt;title>MoDisco Java Discover Benchmark - "/>

-        <body xsi:type="ocl.ecore:PropertyCallExp">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-          <source xsi:type="ocl.ecore:OperationCallExp">

-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//DiscoveredProject"/>

-            <source xsi:type="ocl.ecore:PropertyCallExp" eType="/7/OrderedSet(DiscoveredProject)">

-              <source xsi:type="ocl.ecore:VariableExp" name="b" referredVariable="/0/htmlReport/b">

-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//MultiProjectBenchmark"/>

-              </source>

-              <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//MultiProjectBenchmark/projects"/>

-            </source>

-            <argument xsi:type="ocl.ecore:IntegerLiteralExp" integerSymbol="1">

-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>

-            </argument>

-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)_Class/at"/>

-          </source>

-          <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Project/name"/>

-        </body>

-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;/title>&#xA;&lt;body>&#xA;&lt;h1>MoDisco Java Discover Benchmark - "/>

-        <body xsi:type="ocl.ecore:PropertyCallExp">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-          <source xsi:type="ocl.ecore:OperationCallExp">

-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//DiscoveredProject"/>

-            <source xsi:type="ocl.ecore:PropertyCallExp" eType="/7/OrderedSet(DiscoveredProject)">

-              <source xsi:type="ocl.ecore:VariableExp" name="b" referredVariable="/0/htmlReport/b">

-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//MultiProjectBenchmark"/>

-              </source>

-              <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//MultiProjectBenchmark/projects"/>

-            </source>

-            <argument xsi:type="ocl.ecore:IntegerLiteralExp" integerSymbol="1">

-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>

-            </argument>

-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)_Class/at"/>

-          </source>

-          <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Project/name"/>

-        </body>

-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;/h1>&#xA;&lt;p>Maximum Java heap size = "/>

-        <body xsi:type="ocl.ecore:PropertyCallExp">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>

-          <source xsi:type="ocl.ecore:VariableExp" name="b" referredVariable="/0/htmlReport/b">

-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//MultiProjectBenchmark"/>

-          </source>

-          <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Benchmark/jvmMaxHeapInMiB"/>

-        </body>

-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" MiB&lt;p>&#xA;&lt;p>Java project name = "/>

-        <body xsi:type="ocl.ecore:PropertyCallExp">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-          <source xsi:type="ocl.ecore:OperationCallExp">

-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//DiscoveredProject"/>

-            <source xsi:type="ocl.ecore:PropertyCallExp" eType="/7/OrderedSet(DiscoveredProject)">

-              <source xsi:type="ocl.ecore:VariableExp" name="b" referredVariable="/0/htmlReport/b">

-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//MultiProjectBenchmark"/>

-              </source>

-              <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//MultiProjectBenchmark/projects"/>

-            </source>

-            <argument xsi:type="ocl.ecore:IntegerLiteralExp" integerSymbol="1">

-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>

-            </argument>

-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)_Class/at"/>

-          </source>

-          <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Project/name"/>

-        </body>

-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;/p>&#xA;&#xA;&lt;h2>Summary&lt;/h2>&#xA;  &lt;table border=&quot;1&quot;>&#xA;    &lt;tr>&#xA;       &lt;th>&lt;/th>&#xA;       &lt;th>Total discovery time (mn)&lt;/th>&#xA;       &lt;th>Save time (mn)&lt;/th>&#xA;       &lt;th>Maximum used memory&lt;/th>&#xA;       &lt;th>Initialization time (mn)&lt;/th>&#xA;     &lt;/tr>&#xA;"/>

-        <body xsi:type="mtl:ForBlock">

-          <body xsi:type="mtl:ForBlock">

-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="      &lt;tr>&#xA;        &lt;td>&lt;a href=&quot;#"/>

-            <body xsi:type="ocl.ecore:PropertyCallExp">

-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-              <source xsi:type="ocl.ecore:VariableExp" name="discovery" referredVariable="/0/htmlReport/@body.1/@body.9/@body.0/discovery">

-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-              </source>

-              <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery/name"/>

-            </body>

-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&quot;>"/>

-            <body xsi:type="mtl:TemplateInvocation" definition="/0/getName">

-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-              <argument xsi:type="ocl.ecore:VariableExp" name="discovery" referredVariable="/0/htmlReport/@body.1/@body.9/@body.0/discovery">

-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-              </argument>

-            </body>

-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;/a>&lt;/td>&#xA;        &lt;td>"/>

-            <body xsi:type="ocl.ecore:PropertyCallExp">

-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-              <source xsi:type="ocl.ecore:VariableExp" name="discovery" referredVariable="/0/htmlReport/@body.1/@body.9/@body.0/discovery">

-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-              </source>

-              <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery/totalExecutionTimeInSeconds"/>

-            </body>

-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;/td>&#xA;        &lt;td>"/>

-            <body xsi:type="ocl.ecore:PropertyCallExp">

-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-              <source xsi:type="ocl.ecore:VariableExp" name="discovery" referredVariable="/0/htmlReport/@body.1/@body.9/@body.0/discovery">

-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-              </source>

-              <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery/saveTimeInSeconds"/>

-            </body>

-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;/td>&#xA;        &lt;td>"/>

-            <body xsi:type="ocl.ecore:PropertyCallExp">

-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>

-              <source xsi:type="ocl.ecore:VariableExp" name="discovery" referredVariable="/0/htmlReport/@body.1/@body.9/@body.0/discovery">

-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-              </source>

-              <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery/maxUsedMemoryInBytes"/>

-            </body>

-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;/td>&#xA;        &lt;td>"/>

-            <body xsi:type="mtl:IfBlock">

-              <body xsi:type="mtl:LetBlock">

-                <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#x9;&#x9;&#x9;  "/>

-                <body xsi:type="ocl.ecore:PropertyCallExp">

-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-                  <source xsi:type="ocl.ecore:VariableExp" name="cdoDiscovery" referredVariable="/0/htmlReport/@body.1/@body.9/@body.0/@body.11/@body.0/cdoDiscovery">

-                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/JavaBenchmark/0.9.0/javaBenchmark#//CDODiscovery"/>

-                  </source>

-                  <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/JavaBenchmark/0.9.0/javaBenchmark#//AbstractCDODiscovery/initTimeInSeconds"/>

-                </body>

-                <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>

-                <letVariable name="cdoDiscovery">

-                  <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/JavaBenchmark/0.9.0/javaBenchmark#//CDODiscovery"/>

-                  <initExpression xsi:type="ocl.ecore:OperationCallExp">

-                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/JavaBenchmark/0.9.0/javaBenchmark#//CDODiscovery"/>

-                    <source xsi:type="ocl.ecore:VariableExp" name="discovery" referredVariable="/0/htmlReport/@body.1/@body.9/@body.0/discovery">

-                      <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-                    </source>

-                    <argument xsi:type="ocl.ecore:TypeExp" eType="/21/CDODiscovery">

-                      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/JavaBenchmark/0.9.0/javaBenchmark#//CDODiscovery"/>

-                    </argument>

-                    <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/>

-                  </initExpression>

-                </letVariable>

-              </body>

-              <ifExpr xsi:type="ocl.ecore:OperationCallExp">

-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>

-                <source xsi:type="ocl.ecore:VariableExp" name="discovery" referredVariable="/0/htmlReport/@body.1/@body.9/@body.0/discovery">

-                  <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-                </source>

-                <argument xsi:type="ocl.ecore:TypeExp" eType="/21/CDODiscovery">

-                  <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/JavaBenchmark/0.9.0/javaBenchmark#//CDODiscovery"/>

-                </argument>

-                <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclIsKindOf"/>

-              </ifExpr>

-            </body>

-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;/td>&#xA;     &lt;/tr>    &#xA;"/>

-            <loopVariable name="discovery">

-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-            </loopVariable>

-            <iterSet xsi:type="ocl.ecore:PropertyCallExp" eType="/7/OrderedSet(Discovery)">

-              <source xsi:type="ocl.ecore:VariableExp" name="project" referredVariable="/0/htmlReport/@body.1/@body.9/project">

-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//DiscoveredProject"/>

-              </source>

-              <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//DiscoveredProject/discoveries"/>

-            </iterSet>

-          </body>

-          <loopVariable name="project">

-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//DiscoveredProject"/>

-          </loopVariable>

-          <iterSet xsi:type="ocl.ecore:PropertyCallExp" eType="/7/OrderedSet(DiscoveredProject)">

-            <source xsi:type="ocl.ecore:VariableExp" name="b" referredVariable="/0/htmlReport/b">

-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//MultiProjectBenchmark"/>

-            </source>

-            <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//MultiProjectBenchmark/projects"/>

-          </iterSet>

-        </body>

-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;/table>&#xA;"/>

-        <body xsi:type="mtl:ForBlock">

-          <body xsi:type="mtl:ForBlock">

-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#x9;&lt;h2>&lt;a name=&quot;"/>

-            <body xsi:type="ocl.ecore:PropertyCallExp">

-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-              <source xsi:type="ocl.ecore:VariableExp" name="discovery" referredVariable="/0/htmlReport/@body.1/@body.11/@body.0/discovery">

-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-              </source>

-              <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery/name"/>

-            </body>

-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&quot;/>"/>

-            <body xsi:type="mtl:TemplateInvocation" definition="/0/getName">

-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-              <argument xsi:type="ocl.ecore:VariableExp" name="discovery" referredVariable="/0/htmlReport/@body.1/@body.11/@body.0/discovery">

-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-              </argument>

-            </body>

-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;/h2>&#xA;&#x9;&lt;table>&#xA;&#x9;  &lt;tr>&#xA;&#x9;    &lt;td>&#xA;&#x9;       &lt;p>&#xA;&#x9;          &lt;a href=&quot;"/>

-            <body xsi:type="ocl.ecore:PropertyCallExp">

-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-              <source xsi:type="ocl.ecore:VariableExp" name="discovery" referredVariable="/0/htmlReport/@body.1/@body.11/@body.0/discovery">

-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-              </source>

-              <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery/name"/>

-            </body>

-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=".png&quot;>&#xA;&#x9;          &lt;img height=&quot;300&quot; src=&quot;"/>

-            <body xsi:type="ocl.ecore:PropertyCallExp">

-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-              <source xsi:type="ocl.ecore:VariableExp" name="discovery" referredVariable="/0/htmlReport/@body.1/@body.11/@body.0/discovery">

-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-              </source>

-              <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery/name"/>

-            </body>

-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=".png&quot;/>&#xA;&#x9;          &lt;/a>&#xA;&#x9;       &lt;/p>&#xA;&#x9;     &lt;/td>&#xA;&#x9;     &lt;td>&#xA;&#x9;     &lt;h3>Discovery properties&lt;/h3>&#xA;&#x9;     total execution time (mn) = "/>

-            <body xsi:type="ocl.ecore:PropertyCallExp">

-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-              <source xsi:type="ocl.ecore:VariableExp" name="discovery" referredVariable="/0/htmlReport/@body.1/@body.11/@body.0/discovery">

-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-              </source>

-              <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery/totalExecutionTimeInSeconds"/>

-            </body>

-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;br/>&#xA;&#x9;     save time (mn) = "/>

-            <body xsi:type="ocl.ecore:PropertyCallExp">

-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-              <source xsi:type="ocl.ecore:VariableExp" name="discovery" referredVariable="/0/htmlReport/@body.1/@body.11/@body.0/discovery">

-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-              </source>

-              <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery/saveTimeInSeconds"/>

-            </body>

-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;br/>&#xA;&#x9;     algo variant = "/>

-            <body xsi:type="mtl:IfBlock">

-              <body xsi:type="ocl.ecore:PropertyCallExp">

-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-                <source xsi:type="ocl.ecore:VariableExp" name="discovery" referredVariable="/0/htmlReport/@body.1/@body.11/@body.0/discovery">

-                  <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-                </source>

-                <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery/algorithmVariant"/>

-              </body>

-              <ifExpr xsi:type="ocl.ecore:OperationCallExp">

-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>

-                <source xsi:type="ocl.ecore:PropertyCallExp">

-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-                  <source xsi:type="ocl.ecore:VariableExp" name="discovery" referredVariable="/0/htmlReport/@body.1/@body.11/@body.0/discovery">

-                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-                  </source>

-                  <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery/algorithmVariant"/>

-                </source>

-                <argument xsi:type="ocl.ecore:NullLiteralExp">

-                  <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/>

-                </argument>

-                <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String_Class/%3C%3E"/>

-              </ifExpr>

-            </body>

-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;br/>&#xA;&#x9;     meta-model variant = "/>

-            <body xsi:type="mtl:IfBlock">

-              <body xsi:type="ocl.ecore:PropertyCallExp">

-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-                <source xsi:type="ocl.ecore:VariableExp" name="discovery" referredVariable="/0/htmlReport/@body.1/@body.11/@body.0/discovery">

-                  <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-                </source>

-                <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery/metaModelVariant"/>

-              </body>

-              <ifExpr xsi:type="ocl.ecore:OperationCallExp">

-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>

-                <source xsi:type="ocl.ecore:PropertyCallExp">

-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-                  <source xsi:type="ocl.ecore:VariableExp" name="discovery" referredVariable="/0/htmlReport/@body.1/@body.11/@body.0/discovery">

-                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-                  </source>

-                  <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery/metaModelVariant"/>

-                </source>

-                <argument xsi:type="ocl.ecore:NullLiteralExp">

-                  <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/>

-                </argument>

-                <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String_Class/%3C%3E"/>

-              </ifExpr>

-            </body>

-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;br/>&#xA;&#x9;     dicoverer class name = "/>

-            <body xsi:type="ocl.ecore:PropertyCallExp">

-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-              <source xsi:type="ocl.ecore:VariableExp" name="discovery" referredVariable="/0/htmlReport/@body.1/@body.11/@body.0/discovery">

-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-              </source>

-              <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery/discovererClassName"/>

-            </body>

-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;br/>&#xA;&#x9;     maximum used memory = "/>

-            <body xsi:type="ocl.ecore:PropertyCallExp">

-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>

-              <source xsi:type="ocl.ecore:VariableExp" name="discovery" referredVariable="/0/htmlReport/@body.1/@body.11/@body.0/discovery">

-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-              </source>

-              <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery/maxUsedMemoryInBytes"/>

-            </body>

-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;br/>&#xA;"/>

-            <body xsi:type="mtl:IfBlock">

-              <body xsi:type="mtl:LetBlock">

-                <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#x9;     &lt;h3>CDO properties&lt;/h3>&#xA;&#x9;     CDO version = "/>

-                <body xsi:type="ocl.ecore:PropertyCallExp">

-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-                  <source xsi:type="ocl.ecore:VariableExp" name="cdoConf" referredVariable="/0/htmlReport/@body.1/@body.11/@body.0/@body.21/@body.0/cdoConf">

-                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/JavaBenchmark/0.9.0/javaBenchmark#//CDODiscovery"/>

-                  </source>

-                  <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/JavaBenchmark/0.9.0/javaBenchmark#//AbstractCDODiscovery/version"/>

-                </body>

-                <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;br/>&#xA;&#x9;     revised LRU capacity = "/>

-                <body xsi:type="ocl.ecore:PropertyCallExp">

-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>

-                  <source xsi:type="ocl.ecore:VariableExp" name="cdoConf" referredVariable="/0/htmlReport/@body.1/@body.11/@body.0/@body.21/@body.0/cdoConf">

-                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/JavaBenchmark/0.9.0/javaBenchmark#//CDODiscovery"/>

-                  </source>

-                  <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/JavaBenchmark/0.9.0/javaBenchmark#//AbstractCDODiscovery/revisedLruCapacity"/>

-                </body>

-                <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;br/>&#xA;&#x9;     cache type = "/>

-                <body xsi:type="ocl.ecore:PropertyCallExp">

-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-                  <source xsi:type="ocl.ecore:VariableExp" name="cdoConf" referredVariable="/0/htmlReport/@body.1/@body.11/@body.0/@body.21/@body.0/cdoConf">

-                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/JavaBenchmark/0.9.0/javaBenchmark#//CDODiscovery"/>

-                  </source>

-                  <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/JavaBenchmark/0.9.0/javaBenchmark#//AbstractCDODiscovery/cacheType"/>

-                </body>

-                <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;br/>&#xA;&#x9;     server description = "/>

-                <body xsi:type="ocl.ecore:PropertyCallExp">

-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-                  <source xsi:type="ocl.ecore:VariableExp" name="cdoConf" referredVariable="/0/htmlReport/@body.1/@body.11/@body.0/@body.21/@body.0/cdoConf">

-                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/JavaBenchmark/0.9.0/javaBenchmark#//CDODiscovery"/>

-                  </source>

-                  <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/JavaBenchmark/0.9.0/javaBenchmark#//AbstractCDODiscovery/serverDescription"/>

-                </body>

-                <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;br/>&#xA;&#x9;     current LRU capacity = "/>

-                <body xsi:type="ocl.ecore:PropertyCallExp">

-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>

-                  <source xsi:type="ocl.ecore:VariableExp" name="cdoConf" referredVariable="/0/htmlReport/@body.1/@body.11/@body.0/@body.21/@body.0/cdoConf">

-                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/JavaBenchmark/0.9.0/javaBenchmark#//CDODiscovery"/>

-                  </source>

-                  <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/JavaBenchmark/0.9.0/javaBenchmark#//AbstractCDODiscovery/currentLruCapacity"/>

-                </body>

-                <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;br/>&#xA;&#x9;     comment database initialisation time = __cdoConf.initTime/__&lt;br/>&#xA;"/>

-                <letVariable name="cdoConf">

-                  <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/JavaBenchmark/0.9.0/javaBenchmark#//CDODiscovery"/>

-                  <initExpression xsi:type="ocl.ecore:OperationCallExp">

-                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/JavaBenchmark/0.9.0/javaBenchmark#//CDODiscovery"/>

-                    <source xsi:type="ocl.ecore:VariableExp" name="discovery" referredVariable="/0/htmlReport/@body.1/@body.11/@body.0/discovery">

-                      <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-                    </source>

-                    <argument xsi:type="ocl.ecore:TypeExp" eType="/21/CDODiscovery">

-                      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/JavaBenchmark/0.9.0/javaBenchmark#//CDODiscovery"/>

-                    </argument>

-                    <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/>

-                  </initExpression>

-                </letVariable>

-              </body>

-              <ifExpr xsi:type="ocl.ecore:OperationCallExp">

-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>

-                <source xsi:type="ocl.ecore:VariableExp" name="discovery" referredVariable="/0/htmlReport/@body.1/@body.11/@body.0/discovery">

-                  <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-                </source>

-                <argument xsi:type="ocl.ecore:TypeExp" eType="/21/CDODiscovery">

-                  <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/JavaBenchmark/0.9.0/javaBenchmark#//CDODiscovery"/>

-                </argument>

-                <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclIsKindOf"/>

-              </ifExpr>

-            </body>

-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#x9;     &lt;/td>&#xA;&#x9;   &lt;/tr>&#xA;&#x9;&lt;/table>&#xA;"/>

-            <loopVariable name="discovery">

-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-            </loopVariable>

-            <iterSet xsi:type="ocl.ecore:PropertyCallExp" eType="/7/OrderedSet(Discovery)">

-              <source xsi:type="ocl.ecore:VariableExp" name="project" referredVariable="/0/htmlReport/@body.1/@body.11/project">

-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//DiscoveredProject"/>

-              </source>

-              <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//DiscoveredProject/discoveries"/>

-            </iterSet>

-          </body>

-          <loopVariable name="project">

-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//DiscoveredProject"/>

-          </loopVariable>

-          <iterSet xsi:type="ocl.ecore:PropertyCallExp" eType="/7/OrderedSet(DiscoveredProject)">

-            <source xsi:type="ocl.ecore:VariableExp" name="b" referredVariable="/0/htmlReport/b">

-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//MultiProjectBenchmark"/>

-            </source>

-            <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//MultiProjectBenchmark/projects"/>

-          </iterSet>

-        </body>

-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;hr/>&#xA;&lt;p>This report has been generated with &lt;a href=&quot;http://www.eclipse.org/gmt/modisco/&quot;>MoDisco&lt;/a> Java Discoverer Benchmark.&lt;/p>&#xA;&lt;/body>&lt;/html>&#xA;"/>

-        <fileUrl xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="report.html">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </fileUrl>

-      </body>

-      <parameter name="b">

-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//MultiProjectBenchmark"/>

-      </parameter>

-    </ownedModuleElement>

-    <ownedModuleElement xsi:type="mtl:Template" name="getName" visibility="Public">

-      <body xsi:type="mtl:IfBlock">

-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="CDO"/>

-        <ifExpr xsi:type="ocl.ecore:OperationCallExp">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>

-          <source xsi:type="ocl.ecore:VariableExp" name="discovery" referredVariable="/0/getName/discovery">

-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-          </source>

-          <argument xsi:type="ocl.ecore:TypeExp" eType="/21/CDODiscovery">

-            <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/JavaBenchmark/0.9.0/javaBenchmark#//CDODiscovery"/>

-          </argument>

-          <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclIsKindOf"/>

-        </ifExpr>

-      </body>

-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>

-      <body xsi:type="mtl:IfBlock">

-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" "/>

-        <body xsi:type="ocl.ecore:PropertyCallExp">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-          <source xsi:type="ocl.ecore:VariableExp" name="discovery" referredVariable="/0/getName/discovery">

-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-          </source>

-          <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery/algorithmVariant"/>

-        </body>

-        <ifExpr xsi:type="ocl.ecore:OperationCallExp">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>

-          <source xsi:type="ocl.ecore:PropertyCallExp">

-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-            <source xsi:type="ocl.ecore:VariableExp" name="discovery" referredVariable="/0/getName/discovery">

-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-            </source>

-            <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery/algorithmVariant"/>

-          </source>

-          <argument xsi:type="ocl.ecore:NullLiteralExp">

-            <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/>

-          </argument>

-          <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String_Class/%3C%3E"/>

-        </ifExpr>

-      </body>

-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>

-      <body xsi:type="mtl:IfBlock">

-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" "/>

-        <body xsi:type="ocl.ecore:PropertyCallExp">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-          <source xsi:type="ocl.ecore:VariableExp" name="discovery" referredVariable="/0/getName/discovery">

-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-          </source>

-          <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery/metaModelVariant"/>

-        </body>

-        <ifExpr xsi:type="ocl.ecore:OperationCallExp">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>

-          <source xsi:type="ocl.ecore:PropertyCallExp">

-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-            <source xsi:type="ocl.ecore:VariableExp" name="discovery" referredVariable="/0/getName/discovery">

-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-            </source>

-            <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery/metaModelVariant"/>

-          </source>

-          <argument xsi:type="ocl.ecore:NullLiteralExp">

-            <eType xsi:type="ocl.ecore:VoidType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclVoid"/>

-          </argument>

-          <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String_Class/%3C%3E"/>

-        </ifExpr>

-      </body>

-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>

-      <body xsi:type="mtl:IfBlock">

-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" "/>

-        <body xsi:type="mtl:LetBlock">

-          <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="("/>

-          <body xsi:type="ocl.ecore:PropertyCallExp">

-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-            <source xsi:type="ocl.ecore:VariableExp" name="cdoConf" referredVariable="/0/getName/@body.6/@body.1/cdoConf">

-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/JavaBenchmark/0.9.0/javaBenchmark#//CDODiscovery"/>

-            </source>

-            <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/JavaBenchmark/0.9.0/javaBenchmark#//AbstractCDODiscovery/serverDescription"/>

-          </body>

-          <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=")"/>

-          <letVariable name="cdoConf">

-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/JavaBenchmark/0.9.0/javaBenchmark#//CDODiscovery"/>

-            <initExpression xsi:type="ocl.ecore:OperationCallExp">

-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/JavaBenchmark/0.9.0/javaBenchmark#//CDODiscovery"/>

-              <source xsi:type="ocl.ecore:VariableExp" name="discovery" referredVariable="/0/getName/discovery">

-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-              </source>

-              <argument xsi:type="ocl.ecore:TypeExp" eType="/21/CDODiscovery">

-                <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/JavaBenchmark/0.9.0/javaBenchmark#//CDODiscovery"/>

-              </argument>

-              <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclAsType"/>

-            </initExpression>

-          </letVariable>

-        </body>

-        <ifExpr xsi:type="ocl.ecore:OperationCallExp">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>

-          <source xsi:type="ocl.ecore:VariableExp" name="discovery" referredVariable="/0/getName/discovery">

-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-          </source>

-          <argument xsi:type="ocl.ecore:TypeExp" eType="/21/CDODiscovery">

-            <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/JavaBenchmark/0.9.0/javaBenchmark#//CDODiscovery"/>

-          </argument>

-          <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny_Class/oclIsKindOf"/>

-        </ifExpr>

-      </body>

-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="  "/>

-      <parameter name="discovery">

-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-      </parameter>

-    </ownedModuleElement>

-  </mtl:Module>

-  <ecore:EPackage name="additions">

-    <eClassifiers xsi:type="ecore:EClass" name="String_Class">

-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">

-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-      </eAnnotations>

-      <eOperations name="substitute">

-        <eAnnotations source="MTL"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        <eParameters name="r">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-        <eParameters name="t">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="index">

-        <eAnnotations source="MTL"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>

-        <eParameters name="r">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="first">

-        <eAnnotations source="MTL"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        <eParameters name="n">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="last">

-        <eAnnotations source="MTL"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        <eParameters name="n">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="strstr">

-        <eAnnotations source="MTL"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>

-        <eParameters name="r">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="strtok">

-        <eAnnotations source="MTL"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        <eParameters name="s1">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-        <eParameters name="flag">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="strcmp">

-        <eAnnotations source="MTL"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>

-        <eParameters name="s1">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="isAlpha">

-        <eAnnotations source="MTL"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>

-      </eOperations>

-      <eOperations name="isAlphanum">

-        <eAnnotations source="MTL"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>

-      </eOperations>

-      <eOperations name="toUpperFirst">

-        <eAnnotations source="MTL"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-      </eOperations>

-      <eOperations name="toLowerFirst">

-        <eAnnotations source="MTL"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-      </eOperations>

-      <eOperations name="replace">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        <eParameters name="substring">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-        <eParameters name="replacement">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="replaceAll">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        <eParameters name="substring">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-        <eParameters name="replacement">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="substituteAll">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        <eParameters name="substring">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-        <eParameters name="replacement">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="startsWith">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>

-        <eParameters name="substring">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="endsWith">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>

-        <eParameters name="substring">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="trim">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-      </eOperations>

-      <eOperations name="tokenize">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(String)"/>

-        <eParameters name="delimiters">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="contains">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>

-        <eParameters name="substring">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="matches">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>

-        <eParameters name="regex">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="lastIndex">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>

-        <eParameters name="substring">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="equalsIgnoreCase">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>

-        <eParameters name="other">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="substring">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        <eParameters name="startIndex">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="+">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        <eParameters name="other">

-          <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>

-        </eParameters>

-      </eOperations>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="Integer_Class">

-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">

-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>

-      </eAnnotations>

-      <eOperations name="toString">

-        <eAnnotations source="MTL"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-      </eOperations>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="Real_Class">

-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">

-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-      </eAnnotations>

-      <eOperations name="toString">

-        <eAnnotations source="MTL"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-      </eOperations>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="EObject_Class">

-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">

-        <references href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

-      </eAnnotations>

-      <eOperations name="eAllContents">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>

-      </eOperations>

-      <eOperations name="eAllContents">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>

-        <eParameters name="filter">

-          <eType xsi:type="ocl.ecore:TypeType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclType"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="ancestors">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>

-      </eOperations>

-      <eOperations name="ancestors">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>

-        <eParameters name="filter">

-          <eType xsi:type="ocl.ecore:TypeType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclType"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="siblings">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>

-      </eOperations>

-      <eOperations name="siblings">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>

-        <eParameters name="filter">

-          <eType xsi:type="ocl.ecore:TypeType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclType"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="eInverse">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:OrderedSetType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//OrderedSet(OclAny)"/>

-      </eOperations>

-      <eOperations name="eInverse">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:OrderedSetType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//OrderedSet(OclAny)"/>

-        <eParameters name="filter">

-          <eType xsi:type="ocl.ecore:TypeType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclType"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="precedingSiblings">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>

-      </eOperations>

-      <eOperations name="precedingSiblings">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>

-        <eParameters name="filter">

-          <eType xsi:type="ocl.ecore:TypeType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclType"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="followingSiblings">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>

-      </eOperations>

-      <eOperations name="followingSiblings">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>

-        <eParameters name="filter">

-          <eType xsi:type="ocl.ecore:TypeType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclType"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="eContainer">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//OclAny"/>

-        <eParameters name="filter">

-          <eType xsi:type="ocl.ecore:TypeType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclType"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="eContents">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>

-        <eParameters name="filter">

-          <eType xsi:type="ocl.ecore:TypeType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclType"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="eGet">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-        <eParameters name="featureName">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="htmlReport">

-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">

-          <contents xsi:type="ocl.ecore:Constraint"/>

-        </eAnnotations>

-        <eAnnotations source="MTL" references="/0/htmlReport"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        <eParameters name="b">

-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//MultiProjectBenchmark"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="getName">

-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">

-          <contents xsi:type="ocl.ecore:Constraint"/>

-        </eAnnotations>

-        <eAnnotations source="MTL" references="/0/getName"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        <eParameters name="discovery">

-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-        </eParameters>

-      </eOperations>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="OclAny_Class">

-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">

-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>

-      </eAnnotations>

-      <eOperations name="toString">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-      </eOperations>

-      <eOperations name="invoke">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>

-        <eParameters name="class">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-        <eParameters name="method">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-        <eParameters name="arguments">

-          <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="current">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//OclAny"/>

-        <eParameters name="index">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="current">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//OclAny"/>

-        <eParameters name="filter">

-          <eType xsi:type="ocl.ecore:TypeType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclType"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="getProperty">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        <eParameters name="key">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="getProperty">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        <eParameters name="key">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-        <eParameters name="arguments">

-          <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="getProperty">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        <eParameters name="propertiesFileName">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-        <eParameters name="key">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="getProperty">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        <eParameters name="propertiesFileName">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-        <eParameters name="key">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-        <eParameters name="arguments">

-          <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="+">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        <eParameters name="other">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-      </eOperations>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="Collection(T)_Class">

-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">

-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Collection(T)"/>

-      </eAnnotations>

-      <eOperations name="sep">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>

-        <eParameters name="separatorString">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="filter">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:CollectionType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Collection(T)"/>

-        <eParameters name="filter">

-          <eType xsi:type="ocl.ecore:TypeType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclType"/>

-        </eParameters>

-      </eOperations>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="Sequence(T)_Class">

-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">

-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)"/>

-      </eAnnotations>

-      <eOperations name="reverse">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)"/>

-      </eOperations>

-      <eOperations name="lastIndexOf">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>

-        <eParameters name="element">

-          <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/T"/>

-        </eParameters>

-      </eOperations>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="OrderedSet(T)_Class">

-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">

-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)"/>

-      </eAnnotations>

-      <eOperations name="reverse">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:OrderedSetType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)"/>

-      </eOperations>

-      <eOperations name="lastIndexOf">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>

-        <eParameters name="element">

-          <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/T"/>

-        </eParameters>

-      </eOperations>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="MultiProjectBenchmark_Class">

-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">

-        <references href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//MultiProjectBenchmark"/>

-      </eAnnotations>

-      <eOperations name="htmlReport">

-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">

-          <contents xsi:type="ocl.ecore:Constraint"/>

-        </eAnnotations>

-        <eAnnotations source="MTL" references="/0/htmlReport"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-      </eOperations>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="Discovery_Class">

-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">

-        <references href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-      </eAnnotations>

-      <eOperations name="getName">

-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">

-          <contents xsi:type="ocl.ecore:Constraint"/>

-        </eAnnotations>

-        <eAnnotations source="MTL" references="/0/getName"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-      </eOperations>

-    </eClassifiers>

-  </ecore:EPackage>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//MultiProjectBenchmark"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//MultiProjectBenchmark"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//MultiProjectBenchmark"/>

-  </ocl.ecore:Variable>

-  <ecore:EPackage name="collections">

-    <eClassifiers xsi:type="ocl.ecore:OrderedSetType" name="OrderedSet(DiscoveredProject)" instanceClassName="java.util.LinkedHashSet">

-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//DiscoveredProject"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ocl.ecore:OrderedSetType" name="OrderedSet(Discovery)" instanceClassName="java.util.LinkedHashSet">

-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-    </eClassifiers>

-  </ecore:EPackage>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//MultiProjectBenchmark"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//MultiProjectBenchmark"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//MultiProjectBenchmark"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//MultiProjectBenchmark"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//MultiProjectBenchmark"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//DiscoveredProject"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//DiscoveredProject"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-  </ocl.ecore:Variable>

-  <ecore:EPackage name="types">

-    <eClassifiers xsi:type="ocl.ecore:TypeType" name="CDODiscovery">

-      <referredType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/JavaBenchmark/0.9.0/javaBenchmark#//CDODiscovery"/>

-    </eClassifiers>

-  </ecore:EPackage>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//DiscoveredProject"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//MultiProjectBenchmark"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//MultiProjectBenchmark"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//DiscoveredProject"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//DiscoveredProject"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//DiscoveredProject"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//MultiProjectBenchmark"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

-  </ocl.ecore:Variable>

-  <ecore:EAnnotation source="positions">

-    <eAnnotations source="positions.0" references="/0/htmlReport">

-      <details key="start" value="620"/>

-      <details key="end" value="3442"/>

-      <details key="line" value="15"/>

-    </eAnnotations>

-    <eAnnotations source="positions.1" references="/0/htmlReport/@body.0">

-      <details key="start" value="676"/>

-      <details key="end" value="678"/>

-      <details key="line" value="16"/>

-    </eAnnotations>

-    <eAnnotations source="positions.2" references="/0/htmlReport/@body.1">

-      <details key="start" value="698"/>

-      <details key="end" value="3430"/>

-      <details key="line" value="18"/>

-    </eAnnotations>

-    <eAnnotations source="positions.3" references="/0/htmlReport/@body.1/@body.0">

-      <details key="start" value="728"/>

-      <details key="end" value="776"/>

-      <details key="line" value="19"/>

-    </eAnnotations>

-    <eAnnotations source="positions.4" references="/0/htmlReport/@body.1/@body.1">

-      <details key="start" value="777"/>

-      <details key="end" value="799"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.5" references="/0/htmlReport/@body.1/@body.1/@source">

-      <details key="start" value="777"/>

-      <details key="end" value="794"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.6" references="/0/htmlReport/@body.1/@body.1/@source/@source">

-      <details key="start" value="777"/>

-      <details key="end" value="787"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.7" references="/0/htmlReport/@body.1/@body.1/@source/@source/b">

-      <details key="start" value="777"/>

-      <details key="end" value="778"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.8" references="/0/htmlReport/@body.1/@body.1/@source/@argument.0">

-      <details key="start" value="792"/>

-      <details key="end" value="793"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.9" references="/0/htmlReport/@body.1/@body.2">

-      <details key="start" value="801"/>

-      <details key="end" value="855"/>

-      <details key="line" value="20"/>

-    </eAnnotations>

-    <eAnnotations source="positions.10" references="/0/htmlReport/@body.1/@body.3">

-      <details key="start" value="856"/>

-      <details key="end" value="878"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.11" references="/0/htmlReport/@body.1/@body.3/@source">

-      <details key="start" value="856"/>

-      <details key="end" value="873"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.12" references="/0/htmlReport/@body.1/@body.3/@source/@source">

-      <details key="start" value="856"/>

-      <details key="end" value="866"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.13" references="/0/htmlReport/@body.1/@body.3/@source/@source/b">

-      <details key="start" value="856"/>

-      <details key="end" value="857"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.14" references="/0/htmlReport/@body.1/@body.3/@source/@argument.0">

-      <details key="start" value="871"/>

-      <details key="end" value="872"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.15" references="/0/htmlReport/@body.1/@body.4">

-      <details key="start" value="880"/>

-      <details key="end" value="914"/>

-      <details key="line" value="22"/>

-    </eAnnotations>

-    <eAnnotations source="positions.16" references="/0/htmlReport/@body.1/@body.5">

-      <details key="start" value="915"/>

-      <details key="end" value="932"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.17" references="/0/htmlReport/@body.1/@body.5/b">

-      <details key="start" value="915"/>

-      <details key="end" value="916"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.18" references="/0/htmlReport/@body.1/@body.6">

-      <details key="start" value="934"/>

-      <details key="end" value="965"/>

-      <details key="line" value="23"/>

-    </eAnnotations>

-    <eAnnotations source="positions.19" references="/0/htmlReport/@body.1/@body.7">

-      <details key="start" value="966"/>

-      <details key="end" value="988"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.20" references="/0/htmlReport/@body.1/@body.7/@source">

-      <details key="start" value="966"/>

-      <details key="end" value="983"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.21" references="/0/htmlReport/@body.1/@body.7/@source/@source">

-      <details key="start" value="966"/>

-      <details key="end" value="976"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.22" references="/0/htmlReport/@body.1/@body.7/@source/@source/b">

-      <details key="start" value="966"/>

-      <details key="end" value="967"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.23" references="/0/htmlReport/@body.1/@body.7/@source/@argument.0">

-      <details key="start" value="981"/>

-      <details key="end" value="982"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.24" references="/0/htmlReport/@body.1/@body.8">

-      <details key="start" value="990"/>

-      <details key="end" value="1221"/>

-      <details key="line" value="24"/>

-    </eAnnotations>

-    <eAnnotations source="positions.25" references="/0/htmlReport/@body.1/@body.9">

-      <details key="start" value="1226"/>

-      <details key="end" value="1816"/>

-      <details key="line" value="35"/>

-    </eAnnotations>

-    <eAnnotations source="positions.26" references="/0/htmlReport/@body.1/@body.9/@body.0">

-      <details key="start" value="1280"/>

-      <details key="end" value="1803"/>

-      <details key="line" value="36"/>

-    </eAnnotations>

-    <eAnnotations source="positions.27" references="/0/htmlReport/@body.1/@body.9/@body.0/@body.0">

-      <details key="start" value="1332"/>

-      <details key="end" value="1365"/>

-      <details key="line" value="37"/>

-    </eAnnotations>

-    <eAnnotations source="positions.28" references="/0/htmlReport/@body.1/@body.9/@body.0/@body.1">

-      <details key="start" value="1366"/>

-      <details key="end" value="1380"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.29" references="/0/htmlReport/@body.1/@body.9/@body.0/@body.1/discovery">

-      <details key="start" value="1366"/>

-      <details key="end" value="1375"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.30" references="/0/htmlReport/@body.1/@body.9/@body.0/@body.2">

-      <details key="start" value="1382"/>

-      <details key="end" value="1384"/>

-      <details key="line" value="38"/>

-    </eAnnotations>

-    <eAnnotations source="positions.31" references="/0/htmlReport/@body.1/@body.9/@body.0/@body.3">

-      <details key="start" value="1385"/>

-      <details key="end" value="1403"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.32" references="/0/htmlReport/@body.1/@body.9/@body.0/@body.3/discovery">

-      <details key="start" value="1393"/>

-      <details key="end" value="1402"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.33" references="/0/htmlReport/@body.1/@body.9/@body.0/@body.4">

-      <details key="start" value="1405"/>

-      <details key="end" value="1427"/>

-      <details key="line" value="38"/>

-    </eAnnotations>

-    <eAnnotations source="positions.34" references="/0/htmlReport/@body.1/@body.9/@body.0/@body.5">

-      <details key="start" value="1428"/>

-      <details key="end" value="1465"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.35" references="/0/htmlReport/@body.1/@body.9/@body.0/@body.5/discovery">

-      <details key="start" value="1428"/>

-      <details key="end" value="1437"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.36" references="/0/htmlReport/@body.1/@body.9/@body.0/@body.6">

-      <details key="start" value="1467"/>

-      <details key="end" value="1485"/>

-      <details key="line" value="39"/>

-    </eAnnotations>

-    <eAnnotations source="positions.37" references="/0/htmlReport/@body.1/@body.9/@body.0/@body.7">

-      <details key="start" value="1486"/>

-      <details key="end" value="1513"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.38" references="/0/htmlReport/@body.1/@body.9/@body.0/@body.7/discovery">

-      <details key="start" value="1486"/>

-      <details key="end" value="1495"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.39" references="/0/htmlReport/@body.1/@body.9/@body.0/@body.8">

-      <details key="start" value="1515"/>

-      <details key="end" value="1533"/>

-      <details key="line" value="40"/>

-    </eAnnotations>

-    <eAnnotations source="positions.40" references="/0/htmlReport/@body.1/@body.9/@body.0/@body.9">

-      <details key="start" value="1534"/>

-      <details key="end" value="1564"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.41" references="/0/htmlReport/@body.1/@body.9/@body.0/@body.9/discovery">

-      <details key="start" value="1534"/>

-      <details key="end" value="1543"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.42" references="/0/htmlReport/@body.1/@body.9/@body.0/@body.10">

-      <details key="start" value="1566"/>

-      <details key="end" value="1584"/>

-      <details key="line" value="41"/>

-    </eAnnotations>

-    <eAnnotations source="positions.43" references="/0/htmlReport/@body.1/@body.9/@body.0/@body.11">

-      <details key="start" value="1584"/>

-      <details key="end" value="1771"/>

-      <details key="line" value="42"/>

-    </eAnnotations>

-    <eAnnotations source="positions.44" references="/0/htmlReport/@body.1/@body.9/@body.0/@body.11/@body.0">

-      <details key="start" value="1636"/>

-      <details key="end" value="1759"/>

-      <details key="line" value="43"/>

-    </eAnnotations>

-    <eAnnotations source="positions.45" references="/0/htmlReport/@body.1/@body.9/@body.0/@body.11/@body.0/@body.0">

-      <details key="start" value="1705"/>

-      <details key="end" value="1710"/>

-      <details key="line" value="44"/>

-    </eAnnotations>

-    <eAnnotations source="positions.46" references="/0/htmlReport/@body.1/@body.9/@body.0/@body.11/@body.0/@body.1">

-      <details key="start" value="1711"/>

-      <details key="end" value="1741"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.47" references="/0/htmlReport/@body.1/@body.9/@body.0/@body.11/@body.0/@body.1/cdoDiscovery">

-      <details key="start" value="1711"/>

-      <details key="end" value="1723"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.48" references="/0/htmlReport/@body.1/@body.9/@body.0/@body.11/@body.0/@body.2">

-      <details key="start" value="1743"/>

-      <details key="end" value="1744"/>

-      <details key="line" value="45"/>

-    </eAnnotations>

-    <eAnnotations source="positions.49" references="/0/htmlReport/@body.1/@body.9/@body.0/@body.11/@body.0/cdoDiscovery">

-      <details key="start" value="1641"/>

-      <details key="end" value="1703"/>

-      <details key="line" value="43"/>

-    </eAnnotations>

-    <eAnnotations source="positions.50" references="/0/htmlReport/@body.1/@body.9/@body.0/@body.11/@body.0/cdoDiscovery/@initExpression">

-      <details key="start" value="1671"/>

-      <details key="end" value="1704"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.51" references="/0/htmlReport/@body.1/@body.9/@body.0/@body.11/@body.0/cdoDiscovery/@initExpression/discovery">

-      <details key="start" value="1671"/>

-      <details key="end" value="1680"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.52" references="/0/htmlReport/@body.1/@body.9/@body.0/@body.11/@body.0/cdoDiscovery/@initExpression/@argument.0">

-      <details key="start" value="1691"/>

-      <details key="end" value="1703"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.53" references="/0/htmlReport/@body.1/@body.9/@body.0/@body.11/@ifExpr">

-      <details key="start" value="1588"/>

-      <details key="end" value="1625"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.54" references="/0/htmlReport/@body.1/@body.9/@body.0/@body.11/@ifExpr/discovery">

-      <details key="start" value="1589"/>

-      <details key="end" value="1598"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.55" references="/0/htmlReport/@body.1/@body.9/@body.0/@body.11/@ifExpr/@argument.0">

-      <details key="start" value="1611"/>

-      <details key="end" value="1623"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.56" references="/0/htmlReport/@body.1/@body.9/@body.0/@body.12">

-      <details key="start" value="1771"/>

-      <details key="end" value="1792"/>

-      <details key="line" value="46"/>

-    </eAnnotations>

-    <eAnnotations source="positions.57" references="/0/htmlReport/@body.1/@body.9/@body.0/discovery">

-      <details key="start" value="1286"/>

-      <details key="end" value="1307"/>

-      <details key="line" value="36"/>

-    </eAnnotations>

-    <eAnnotations source="positions.58" references="/0/htmlReport/@body.1/@body.9/@body.0/@iterSet">

-      <details key="start" value="1310"/>

-      <details key="end" value="1329"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.59" references="/0/htmlReport/@body.1/@body.9/@body.0/@iterSet/project">

-      <details key="start" value="1310"/>

-      <details key="end" value="1317"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.60" references="/0/htmlReport/@body.1/@body.9/project">

-      <details key="start" value="1232"/>

-      <details key="end" value="1259"/>

-      <details key="line" value="35"/>

-    </eAnnotations>

-    <eAnnotations source="positions.61" references="/0/htmlReport/@body.1/@body.9/@iterSet">

-      <details key="start" value="1262"/>

-      <details key="end" value="1272"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.62" references="/0/htmlReport/@body.1/@body.9/@iterSet/b">

-      <details key="start" value="1262"/>

-      <details key="end" value="1263"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.63" references="/0/htmlReport/@body.1/@body.10">

-      <details key="start" value="1817"/>

-      <details key="end" value="1826"/>

-      <details key="line" value="50"/>

-    </eAnnotations>

-    <eAnnotations source="positions.64" references="/0/htmlReport/@body.1/@body.11">

-      <details key="start" value="1826"/>

-      <details key="end" value="3272"/>

-      <details key="line" value="51"/>

-    </eAnnotations>

-    <eAnnotations source="positions.65" references="/0/htmlReport/@body.1/@body.11/@body.0">

-      <details key="start" value="1875"/>

-      <details key="end" value="3265"/>

-      <details key="line" value="52"/>

-    </eAnnotations>

-    <eAnnotations source="positions.66" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.0">

-      <details key="start" value="1927"/>

-      <details key="end" value="1941"/>

-      <details key="line" value="53"/>

-    </eAnnotations>

-    <eAnnotations source="positions.67" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.1">

-      <details key="start" value="1942"/>

-      <details key="end" value="1956"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.68" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.1/discovery">

-      <details key="start" value="1942"/>

-      <details key="end" value="1951"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.69" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.2">

-      <details key="start" value="1958"/>

-      <details key="end" value="1961"/>

-      <details key="line" value="53"/>

-    </eAnnotations>

-    <eAnnotations source="positions.70" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.3">

-      <details key="start" value="1962"/>

-      <details key="end" value="1980"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.71" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.3/discovery">

-      <details key="start" value="1970"/>

-      <details key="end" value="1979"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.72" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.4">

-      <details key="start" value="1982"/>

-      <details key="end" value="2047"/>

-      <details key="line" value="53"/>

-    </eAnnotations>

-    <eAnnotations source="positions.73" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.5">

-      <details key="start" value="2048"/>

-      <details key="end" value="2062"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.74" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.5/discovery">

-      <details key="start" value="2048"/>

-      <details key="end" value="2057"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.75" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.6">

-      <details key="start" value="2064"/>

-      <details key="end" value="2105"/>

-      <details key="line" value="58"/>

-    </eAnnotations>

-    <eAnnotations source="positions.76" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.7">

-      <details key="start" value="2106"/>

-      <details key="end" value="2120"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.77" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.7/discovery">

-      <details key="start" value="2106"/>

-      <details key="end" value="2115"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.78" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.8">

-      <details key="start" value="2122"/>

-      <details key="end" value="2252"/>

-      <details key="line" value="59"/>

-    </eAnnotations>

-    <eAnnotations source="positions.79" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.9">

-      <details key="start" value="2253"/>

-      <details key="end" value="2290"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.80" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.9/discovery">

-      <details key="start" value="2253"/>

-      <details key="end" value="2262"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.81" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.10">

-      <details key="start" value="2292"/>

-      <details key="end" value="2321"/>

-      <details key="line" value="65"/>

-    </eAnnotations>

-    <eAnnotations source="positions.82" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.11">

-      <details key="start" value="2322"/>

-      <details key="end" value="2349"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.83" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.11/discovery">

-      <details key="start" value="2322"/>

-      <details key="end" value="2331"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.84" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.12">

-      <details key="start" value="2351"/>

-      <details key="end" value="2378"/>

-      <details key="line" value="66"/>

-    </eAnnotations>

-    <eAnnotations source="positions.85" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.13">

-      <details key="start" value="2378"/>

-      <details key="end" value="2451"/>

-      <details key="line" value="67"/>

-    </eAnnotations>

-    <eAnnotations source="positions.86" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.13/@body.0">

-      <details key="start" value="2418"/>

-      <details key="end" value="2444"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.87" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.13/@body.0/discovery">

-      <details key="start" value="2418"/>

-      <details key="end" value="2427"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.88" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.13/@ifExpr">

-      <details key="start" value="2382"/>

-      <details key="end" value="2416"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.89" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.13/@ifExpr/@source">

-      <details key="start" value="2383"/>

-      <details key="end" value="2409"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.90" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.13/@ifExpr/@source/discovery">

-      <details key="start" value="2383"/>

-      <details key="end" value="2392"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.91" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.13/@ifExpr/@argument.0">

-      <details key="start" value="2411"/>

-      <details key="end" value="2415"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.92" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.14">

-      <details key="start" value="2451"/>

-      <details key="end" value="2484"/>

-      <details key="line" value="67"/>

-    </eAnnotations>

-    <eAnnotations source="positions.93" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.15">

-      <details key="start" value="2484"/>

-      <details key="end" value="2557"/>

-      <details key="line" value="68"/>

-    </eAnnotations>

-    <eAnnotations source="positions.94" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.15/@body.0">

-      <details key="start" value="2524"/>

-      <details key="end" value="2550"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.95" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.15/@body.0/discovery">

-      <details key="start" value="2524"/>

-      <details key="end" value="2533"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.96" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.15/@ifExpr">

-      <details key="start" value="2488"/>

-      <details key="end" value="2522"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.97" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.15/@ifExpr/@source">

-      <details key="start" value="2489"/>

-      <details key="end" value="2515"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.98" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.15/@ifExpr/@source/discovery">

-      <details key="start" value="2489"/>

-      <details key="end" value="2498"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.99" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.15/@ifExpr/@argument.0">

-      <details key="start" value="2517"/>

-      <details key="end" value="2521"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.100" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.16">

-      <details key="start" value="2557"/>

-      <details key="end" value="2592"/>

-      <details key="line" value="68"/>

-    </eAnnotations>

-    <eAnnotations source="positions.101" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.17">

-      <details key="start" value="2593"/>

-      <details key="end" value="2622"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.102" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.17/discovery">

-      <details key="start" value="2593"/>

-      <details key="end" value="2602"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.103" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.18">

-      <details key="start" value="2624"/>

-      <details key="end" value="2658"/>

-      <details key="line" value="69"/>

-    </eAnnotations>

-    <eAnnotations source="positions.104" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.19">

-      <details key="start" value="2659"/>

-      <details key="end" value="2689"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.105" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.19/discovery">

-      <details key="start" value="2659"/>

-      <details key="end" value="2668"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.106" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.20">

-      <details key="start" value="2691"/>

-      <details key="end" value="2697"/>

-      <details key="line" value="70"/>

-    </eAnnotations>

-    <eAnnotations source="positions.107" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.21">

-      <details key="start" value="2703"/>

-      <details key="end" value="3226"/>

-      <details key="line" value="71"/>

-    </eAnnotations>

-    <eAnnotations source="positions.108" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.21/@body.0">

-      <details key="start" value="2755"/>

-      <details key="end" value="3214"/>

-      <details key="line" value="72"/>

-    </eAnnotations>

-    <eAnnotations source="positions.109" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.21/@body.0/@body.0">

-      <details key="start" value="2819"/>

-      <details key="end" value="2869"/>

-      <details key="line" value="73"/>

-    </eAnnotations>

-    <eAnnotations source="positions.110" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.21/@body.0/@body.1">

-      <details key="start" value="2870"/>

-      <details key="end" value="2885"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.111" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.21/@body.0/@body.1/cdoConf">

-      <details key="start" value="2870"/>

-      <details key="end" value="2877"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.112" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.21/@body.0/@body.2">

-      <details key="start" value="2887"/>

-      <details key="end" value="2922"/>

-      <details key="line" value="74"/>

-    </eAnnotations>

-    <eAnnotations source="positions.113" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.21/@body.0/@body.3">

-      <details key="start" value="2923"/>

-      <details key="end" value="2949"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.114" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.21/@body.0/@body.3/cdoConf">

-      <details key="start" value="2923"/>

-      <details key="end" value="2930"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.115" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.21/@body.0/@body.4">

-      <details key="start" value="2951"/>

-      <details key="end" value="2976"/>

-      <details key="line" value="75"/>

-    </eAnnotations>

-    <eAnnotations source="positions.116" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.21/@body.0/@body.5">

-      <details key="start" value="2977"/>

-      <details key="end" value="2994"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.117" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.21/@body.0/@body.5/cdoConf">

-      <details key="start" value="2977"/>

-      <details key="end" value="2984"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.118" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.21/@body.0/@body.6">

-      <details key="start" value="2996"/>

-      <details key="end" value="3029"/>

-      <details key="line" value="76"/>

-    </eAnnotations>

-    <eAnnotations source="positions.119" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.21/@body.0/@body.7">

-      <details key="start" value="3030"/>

-      <details key="end" value="3055"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.120" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.21/@body.0/@body.7/cdoConf">

-      <details key="start" value="3030"/>

-      <details key="end" value="3037"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.121" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.21/@body.0/@body.8">

-      <details key="start" value="3057"/>

-      <details key="end" value="3092"/>

-      <details key="line" value="77"/>

-    </eAnnotations>

-    <eAnnotations source="positions.122" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.21/@body.0/@body.9">

-      <details key="start" value="3093"/>

-      <details key="end" value="3119"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.123" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.21/@body.0/@body.9/cdoConf">

-      <details key="start" value="3093"/>

-      <details key="end" value="3100"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.124" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.21/@body.0/@body.10">

-      <details key="start" value="3121"/>

-      <details key="end" value="3199"/>

-      <details key="line" value="78"/>

-    </eAnnotations>

-    <eAnnotations source="positions.125" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.21/@body.0/cdoConf">

-      <details key="start" value="2760"/>

-      <details key="end" value="2817"/>

-      <details key="line" value="72"/>

-    </eAnnotations>

-    <eAnnotations source="positions.126" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.21/@body.0/cdoConf/@initExpression">

-      <details key="start" value="2785"/>

-      <details key="end" value="2818"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.127" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.21/@body.0/cdoConf/@initExpression/discovery">

-      <details key="start" value="2785"/>

-      <details key="end" value="2794"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.128" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.21/@body.0/cdoConf/@initExpression/@argument.0">

-      <details key="start" value="2805"/>

-      <details key="end" value="2817"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.129" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.21/@ifExpr">

-      <details key="start" value="2707"/>

-      <details key="end" value="2744"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.130" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.21/@ifExpr/discovery">

-      <details key="start" value="2708"/>

-      <details key="end" value="2717"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.131" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.21/@ifExpr/@argument.0">

-      <details key="start" value="2730"/>

-      <details key="end" value="2742"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.132" references="/0/htmlReport/@body.1/@body.11/@body.0/@body.22">

-      <details key="start" value="3227"/>

-      <details key="end" value="3259"/>

-      <details key="line" value="82"/>

-    </eAnnotations>

-    <eAnnotations source="positions.133" references="/0/htmlReport/@body.1/@body.11/@body.0/discovery">

-      <details key="start" value="1881"/>

-      <details key="end" value="1902"/>

-      <details key="line" value="52"/>

-    </eAnnotations>

-    <eAnnotations source="positions.134" references="/0/htmlReport/@body.1/@body.11/@body.0/@iterSet">

-      <details key="start" value="1904"/>

-      <details key="end" value="1923"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.135" references="/0/htmlReport/@body.1/@body.11/@body.0/@iterSet/project">

-      <details key="start" value="1904"/>

-      <details key="end" value="1911"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.136" references="/0/htmlReport/@body.1/@body.11/project">

-      <details key="start" value="1832"/>

-      <details key="end" value="1859"/>

-      <details key="line" value="51"/>

-    </eAnnotations>

-    <eAnnotations source="positions.137" references="/0/htmlReport/@body.1/@body.11/@iterSet">

-      <details key="start" value="1862"/>

-      <details key="end" value="1872"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.138" references="/0/htmlReport/@body.1/@body.11/@iterSet/b">

-      <details key="start" value="1862"/>

-      <details key="end" value="1863"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.139" references="/0/htmlReport/@body.1/@body.12">

-      <details key="start" value="3273"/>

-      <details key="end" value="3422"/>

-      <details key="line" value="87"/>

-    </eAnnotations>

-    <eAnnotations source="positions.140" references="/0/htmlReport/@body.1/@fileUrl">

-      <details key="start" value="705"/>

-      <details key="end" value="718"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.141" references="/0/htmlReport/b">

-      <details key="start" value="648"/>

-      <details key="end" value="673"/>

-      <details key="line" value="15"/>

-    </eAnnotations>

-    <eAnnotations source="positions.142" references="/0/getName">

-      <details key="start" value="3444"/>

-      <details key="end" value="3855"/>

-      <details key="line" value="93"/>

-    </eAnnotations>

-    <eAnnotations source="positions.143" references="/0/getName/@body.0">

-      <details key="start" value="3493"/>

-      <details key="end" value="3543"/>

-      <details key="line" value="94"/>

-    </eAnnotations>

-    <eAnnotations source="positions.144" references="/0/getName/@body.0/@body.0">

-      <details key="start" value="3535"/>

-      <details key="end" value="3538"/>

-      <details key="line" value="94"/>

-    </eAnnotations>

-    <eAnnotations source="positions.145" references="/0/getName/@body.0/@ifExpr">

-      <details key="start" value="3497"/>

-      <details key="end" value="3534"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.146" references="/0/getName/@body.0/@ifExpr/discovery">

-      <details key="start" value="3498"/>

-      <details key="end" value="3507"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.147" references="/0/getName/@body.0/@ifExpr/@argument.0">

-      <details key="start" value="3520"/>

-      <details key="end" value="3532"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.148" references="/0/getName/@body.1">

-      <details key="start" value="3543"/>

-      <details key="end" value="3544"/>

-      <details key="line" value="95"/>

-    </eAnnotations>

-    <eAnnotations source="positions.149" references="/0/getName/@body.2">

-      <details key="start" value="3544"/>

-      <details key="end" value="3618"/>

-      <details key="line" value="95"/>

-    </eAnnotations>

-    <eAnnotations source="positions.150" references="/0/getName/@body.2/@body.0">

-      <details key="start" value="3583"/>

-      <details key="end" value="3584"/>

-      <details key="line" value="95"/>

-    </eAnnotations>

-    <eAnnotations source="positions.151" references="/0/getName/@body.2/@body.1">

-      <details key="start" value="3585"/>

-      <details key="end" value="3611"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.152" references="/0/getName/@body.2/@body.1/discovery">

-      <details key="start" value="3585"/>

-      <details key="end" value="3594"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.153" references="/0/getName/@body.2/@ifExpr">

-      <details key="start" value="3548"/>

-      <details key="end" value="3582"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.154" references="/0/getName/@body.2/@ifExpr/@source">

-      <details key="start" value="3549"/>

-      <details key="end" value="3575"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.155" references="/0/getName/@body.2/@ifExpr/@source/discovery">

-      <details key="start" value="3549"/>

-      <details key="end" value="3558"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.156" references="/0/getName/@body.2/@ifExpr/@argument.0">

-      <details key="start" value="3577"/>

-      <details key="end" value="3581"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.157" references="/0/getName/@body.3">

-      <details key="start" value="3618"/>

-      <details key="end" value="3619"/>

-      <details key="line" value="96"/>

-    </eAnnotations>

-    <eAnnotations source="positions.158" references="/0/getName/@body.4">

-      <details key="start" value="3619"/>

-      <details key="end" value="3693"/>

-      <details key="line" value="96"/>

-    </eAnnotations>

-    <eAnnotations source="positions.159" references="/0/getName/@body.4/@body.0">

-      <details key="start" value="3658"/>

-      <details key="end" value="3659"/>

-      <details key="line" value="96"/>

-    </eAnnotations>

-    <eAnnotations source="positions.160" references="/0/getName/@body.4/@body.1">

-      <details key="start" value="3660"/>

-      <details key="end" value="3686"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.161" references="/0/getName/@body.4/@body.1/discovery">

-      <details key="start" value="3660"/>

-      <details key="end" value="3669"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.162" references="/0/getName/@body.4/@ifExpr">

-      <details key="start" value="3623"/>

-      <details key="end" value="3657"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.163" references="/0/getName/@body.4/@ifExpr/@source">

-      <details key="start" value="3624"/>

-      <details key="end" value="3650"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.164" references="/0/getName/@body.4/@ifExpr/@source/discovery">

-      <details key="start" value="3624"/>

-      <details key="end" value="3633"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.165" references="/0/getName/@body.4/@ifExpr/@argument.0">

-      <details key="start" value="3652"/>

-      <details key="end" value="3656"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.166" references="/0/getName/@body.5">

-      <details key="start" value="3693"/>

-      <details key="end" value="3694"/>

-      <details key="line" value="97"/>

-    </eAnnotations>

-    <eAnnotations source="positions.167" references="/0/getName/@body.6">

-      <details key="start" value="3694"/>

-      <details key="end" value="3841"/>

-      <details key="line" value="97"/>

-    </eAnnotations>

-    <eAnnotations source="positions.168" references="/0/getName/@body.6/@body.0">

-      <details key="start" value="3736"/>

-      <details key="end" value="3737"/>

-      <details key="line" value="97"/>

-    </eAnnotations>

-    <eAnnotations source="positions.169" references="/0/getName/@body.6/@body.1">

-      <details key="start" value="3737"/>

-      <details key="end" value="3836"/>

-      <details key="line" value="97"/>

-    </eAnnotations>

-    <eAnnotations source="positions.170" references="/0/getName/@body.6/@body.1/@body.0">

-      <details key="start" value="3800"/>

-      <details key="end" value="3801"/>

-      <details key="line" value="97"/>

-    </eAnnotations>

-    <eAnnotations source="positions.171" references="/0/getName/@body.6/@body.1/@body.1">

-      <details key="start" value="3802"/>

-      <details key="end" value="3827"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.172" references="/0/getName/@body.6/@body.1/@body.1/cdoConf">

-      <details key="start" value="3802"/>

-      <details key="end" value="3809"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.173" references="/0/getName/@body.6/@body.1/@body.2">

-      <details key="start" value="3829"/>

-      <details key="end" value="3830"/>

-      <details key="line" value="97"/>

-    </eAnnotations>

-    <eAnnotations source="positions.174" references="/0/getName/@body.6/@body.1/cdoConf">

-      <details key="start" value="3742"/>

-      <details key="end" value="3799"/>

-      <details key="line" value="97"/>

-    </eAnnotations>

-    <eAnnotations source="positions.175" references="/0/getName/@body.6/@body.1/cdoConf/@initExpression">

-      <details key="start" value="3767"/>

-      <details key="end" value="3800"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.176" references="/0/getName/@body.6/@body.1/cdoConf/@initExpression/discovery">

-      <details key="start" value="3767"/>

-      <details key="end" value="3776"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.177" references="/0/getName/@body.6/@body.1/cdoConf/@initExpression/@argument.0">

-      <details key="start" value="3787"/>

-      <details key="end" value="3799"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.178" references="/0/getName/@body.6/@ifExpr">

-      <details key="start" value="3698"/>

-      <details key="end" value="3735"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.179" references="/0/getName/@body.6/@ifExpr/discovery">

-      <details key="start" value="3699"/>

-      <details key="end" value="3708"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.180" references="/0/getName/@body.6/@ifExpr/@argument.0">

-      <details key="start" value="3721"/>

-      <details key="end" value="3733"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.181" references="/0/getName/@body.7">

-      <details key="start" value="3841"/>

-      <details key="end" value="3843"/>

-      <details key="line" value="97"/>

-    </eAnnotations>

-    <eAnnotations source="positions.182" references="/0/getName/discovery">

-      <details key="start" value="3469"/>

-      <details key="end" value="3490"/>

-      <details key="line" value="93"/>

-    </eAnnotations>

-  </ecore:EAnnotation>

-</xmi:XMI>

diff --git a/org.eclipse.modisco.java.discoverer.benchmark/emtl/org/eclipse/modisco/java/discoverer/benchmark/template/html/htmlReport2.emtl b/org.eclipse.modisco.java.discoverer.benchmark/emtl/org/eclipse/modisco/java/discoverer/benchmark/template/html/htmlReport2.emtl
deleted file mode 100644
index 92182e1..0000000
--- a/org.eclipse.modisco.java.discoverer.benchmark/emtl/org/eclipse/modisco/java/discoverer/benchmark/template/html/htmlReport2.emtl
+++ /dev/null
@@ -1,3278 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:mtl="http://www.eclipse.org/acceleo/mtl/3.0" xmlns:ocl.ecore="http://www.eclipse.org/ocl/1.1.0/Ecore">

-  <mtl:Module name="htmlReport2" nsURI="org::eclipse::modisco::java::discoverer::benchmark::template::html::htmlReport2" startHeaderPosition="441" endHeaderPosition="588">

-    <input>

-      <takesTypesFrom href="http://www.eclipse.org/MoDisco/JavaBenchmark/0.9.0/javaBenchmark#/"/>

-    </input>

-    <input>

-      <takesTypesFrom href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#/"/>

-    </input>

-    <ownedModuleElement xsi:type="mtl:Query" name="maxExecutionTime" visibility="Public">

-      <parameter name="discoveries" eType="/3/Set(Discovery)"/>

-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">

-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>

-        <source xsi:type="ocl.ecore:VariableExp" name="self" eType="/3/Set(Discovery)" referredVariable="/5"/>

-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.modisco.java.discoverer.benchmark.template.html.HtmlReportServices">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </argument>

-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="maxExecutionTime(java.util.Collection)">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </argument>

-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/3/Sequence(Set(Discovery))" kind="Sequence">

-          <part xsi:type="ocl.ecore:CollectionItem" eType="/3/Set(Discovery)">

-            <item xsi:type="ocl.ecore:VariableExp" name="discoveries" eType="/3/Set(Discovery)" referredVariable="/0/maxExecutionTime/discoveries"/>

-          </part>

-        </argument>

-      </expression>

-      <type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-    </ownedModuleElement>

-    <ownedModuleElement xsi:type="mtl:Query" name="maxSaveTime" visibility="Public">

-      <parameter name="discoveries" eType="/3/Set(Discovery)"/>

-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">

-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>

-        <source xsi:type="ocl.ecore:VariableExp" name="self" eType="/3/Set(Discovery)" referredVariable="/8"/>

-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.modisco.java.discoverer.benchmark.template.html.HtmlReportServices">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </argument>

-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="maxSaveTime(java.util.Collection)">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </argument>

-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/3/Sequence(Set(Discovery))" kind="Sequence">

-          <part xsi:type="ocl.ecore:CollectionItem" eType="/3/Set(Discovery)">

-            <item xsi:type="ocl.ecore:VariableExp" name="discoveries" eType="/3/Set(Discovery)" referredVariable="/0/maxSaveTime/discoveries"/>

-          </part>

-        </argument>

-      </expression>

-      <type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-    </ownedModuleElement>

-    <ownedModuleElement xsi:type="mtl:Query" name="lfToBr" visibility="Public">

-      <parameter name="str">

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-      </parameter>

-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">

-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>

-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/11">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </source>

-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.modisco.java.discoverer.benchmark.template.html.HtmlReportServices">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </argument>

-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="lfToBr(java.lang.String)">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </argument>

-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/3/Sequence(String)" kind="Sequence">

-          <part xsi:type="ocl.ecore:CollectionItem">

-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-            <item xsi:type="ocl.ecore:VariableExp" name="str" referredVariable="/0/lfToBr/str">

-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-            </item>

-          </part>

-        </argument>

-      </expression>

-      <type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-    </ownedModuleElement>

-    <ownedModuleElement xsi:type="mtl:Query" name="sizeWithUnit" visibility="Public">

-      <parameter name="value">

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-      </parameter>

-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">

-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>

-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/14">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-        </source>

-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.modisco.java.discoverer.benchmark.template.html.HtmlReportServices">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </argument>

-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="sizeWithUnit(java.lang.Double)">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </argument>

-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/3/Sequence(Real)" kind="Sequence">

-          <part xsi:type="ocl.ecore:CollectionItem">

-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-            <item xsi:type="ocl.ecore:VariableExp" name="value" referredVariable="/0/sizeWithUnit/value">

-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-            </item>

-          </part>

-        </argument>

-      </expression>

-      <type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-    </ownedModuleElement>

-    <ownedModuleElement xsi:type="mtl:Query" name="timeWithUnit" visibility="Public">

-      <parameter name="value">

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-      </parameter>

-      <expression xsi:type="ocl.ecore:OperationCallExp" referredOperation="/1/OclAny_Class/invoke">

-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>

-        <source xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/17">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-        </source>

-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="org.eclipse.modisco.java.discoverer.benchmark.template.html.HtmlReportServices">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </argument>

-        <argument xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="timeWithUnit(java.lang.Double)">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </argument>

-        <argument xsi:type="ocl.ecore:CollectionLiteralExp" eType="/3/Sequence(Real)" kind="Sequence">

-          <part xsi:type="ocl.ecore:CollectionItem">

-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-            <item xsi:type="ocl.ecore:VariableExp" name="value" referredVariable="/0/timeWithUnit/value">

-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-            </item>

-          </part>

-        </argument>

-      </expression>

-      <type xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-    </ownedModuleElement>

-    <ownedModuleElement xsi:type="mtl:Template" name="htmlReport" visibility="Public" main="true">

-      <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>

-      <body xsi:type="mtl:FileBlock" openMode="OverWrite">

-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD XHTML 1.0 Transitional//EN&quot;&#xA;&quot;http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd&quot;>&#xA;&lt;html>&#xA;&lt;head>&#xA;&#xA;&lt;style type=&quot;text/css&quot;>&#xA;  .graph {&#xA;    background-color: #E0E0E0;&#xA;    border: solid 1px black;&#xA;  }&#xA;  .graph td {&#xA;    font-family: verdana, arial, sans serif;&#xA;  }&#xA;  .bar {&#xA;    background-color: white;&#xA;    text-align: right;&#xA;    border: solid 1px black;&#xA;    width: 400px;&#xA;  }&#xA;  .bar div { &#xA;    background-color: #A0A0FF;&#xA;    text-align: right;&#xA;    float: left;&#xA;    height: 20px;&#xA;  }&#xA;  body {&#xA;    background-color: white;&#xA;  }&#xA;  td {&#xA;    text-align: center;&#xA;  }&#xA;&lt;/style>&#xA;&#xA;&lt;title>MoDisco Java Discover Benchmark&lt;/title>&#xA;&lt;/head>&#xA;&#xA;&lt;body>&#xA;&#xA;&lt;h2>Execution time by project size&lt;/h2>&#xA;&#xA;&lt;img src=&quot;executionTimeByProjectSize.png&quot;/>&#xA;&#xA;&lt;h2>System Information&lt;/h2>&#xA;  &lt;table border=&quot;1&quot; cellpadding=&quot;2&quot; cellspacing=&quot;0&quot;>&#xA;    &lt;tr>&#xA;       &lt;th>OS name&lt;/th>&#xA;       &lt;td>"/>

-        <body xsi:type="ocl.ecore:PropertyCallExp">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-          <source xsi:type="ocl.ecore:VariableExp" name="b" referredVariable="/0/htmlReport/b">

-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedMultiDiscoveryBenchmark"/>

-          </source>

-          <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Benchmark/osName"/>

-        </body>

-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;/td>&#xA;    &lt;/tr>&#xA;       &#xA;    &lt;tr>&#xA;       &lt;th>OS version&lt;/th>&#xA;       &lt;td>"/>

-        <body xsi:type="ocl.ecore:PropertyCallExp">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-          <source xsi:type="ocl.ecore:VariableExp" name="b" referredVariable="/0/htmlReport/b">

-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedMultiDiscoveryBenchmark"/>

-          </source>

-          <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Benchmark/osVersion"/>

-        </body>

-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;/td>&#xA;    &lt;/tr>&#xA;       &#xA;    &lt;tr>&#xA;       &lt;th>OS architecture&lt;/th>&#xA;       &lt;td>"/>

-        <body xsi:type="ocl.ecore:PropertyCallExp">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-          <source xsi:type="ocl.ecore:VariableExp" name="b" referredVariable="/0/htmlReport/b">

-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedMultiDiscoveryBenchmark"/>

-          </source>

-          <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Benchmark/osArchitecture"/>

-        </body>

-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;/td>&#xA;    &lt;/tr>&#xA;       &#xA;    &lt;tr>&#xA;       &lt;th>Number of processor cores&lt;/th>&#xA;       &lt;td>"/>

-        <body xsi:type="ocl.ecore:PropertyCallExp">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>

-          <source xsi:type="ocl.ecore:VariableExp" name="b" referredVariable="/0/htmlReport/b">

-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedMultiDiscoveryBenchmark"/>

-          </source>

-          <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Benchmark/processorCount"/>

-        </body>

-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;/td>&#xA;    &lt;/tr>&#xA;&#xA;    &lt;tr>&#xA;       &lt;th>Processor name&lt;/th>&#xA;       &lt;td>"/>

-        <body xsi:type="ocl.ecore:PropertyCallExp">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-          <source xsi:type="ocl.ecore:VariableExp" name="b" referredVariable="/0/htmlReport/b">

-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedMultiDiscoveryBenchmark"/>

-          </source>

-          <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Benchmark/processorName"/>

-        </body>

-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;/td>&#xA;    &lt;/tr>&#xA;&#xA;    &lt;tr>&#xA;       &lt;th>Processor description&lt;/th>&#xA;       &lt;td>"/>

-        <body xsi:type="ocl.ecore:PropertyCallExp">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-          <source xsi:type="ocl.ecore:VariableExp" name="b" referredVariable="/0/htmlReport/b">

-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedMultiDiscoveryBenchmark"/>

-          </source>

-          <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Benchmark/processorDescription"/>

-        </body>

-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;/td>&#xA;    &lt;/tr>&#xA;&#xA;    &lt;tr>&#xA;       &lt;th>Processor cache size&lt;/th>&#xA;       &lt;td>"/>

-        <body xsi:type="ocl.ecore:PropertyCallExp">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-          <source xsi:type="ocl.ecore:VariableExp" name="b" referredVariable="/0/htmlReport/b">

-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedMultiDiscoveryBenchmark"/>

-          </source>

-          <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Benchmark/processorCacheSize"/>

-        </body>

-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;/td>&#xA;    &lt;/tr>&#xA;&#xA;    &lt;tr>&#xA;       &lt;th>System memory&lt;/th>&#xA;       &lt;td>"/>

-        <body xsi:type="ocl.ecore:PropertyCallExp">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-          <source xsi:type="ocl.ecore:VariableExp" name="b" referredVariable="/0/htmlReport/b">

-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedMultiDiscoveryBenchmark"/>

-          </source>

-          <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Benchmark/systemMemory"/>

-        </body>

-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;/td>&#xA;    &lt;/tr>&#xA;  &lt;/table>&#xA;&#xA;&lt;h2>Results Overview&lt;/h2>&#xA;&#xA;  &lt;table border=&quot;1&quot; cellpadding=&quot;2&quot; cellspacing=&quot;0&quot;>&#xA;    &lt;tr>&#xA;       &lt;th>Project&lt;/th>&#xA;       &lt;th>Average discovery time&lt;/th>&#xA;       &lt;th>Average save time&lt;/th>&#xA;       &lt;th>Number of model elements&lt;/th>&#xA;       &lt;th>Total size&lt;/th>&#xA;       &lt;th>Average file size&lt;/th>&#xA;       &lt;th>Total lines&lt;/th>&#xA;       &lt;th>Average lines per file&lt;/th>&#xA;       &lt;th>XMI size&lt;/th>&#xA;     &lt;/tr>&#xA;"/>

-        <body xsi:type="mtl:ForBlock">

-          <body xsi:type="mtl:LetBlock">

-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="         &lt;tr>&#xA;            &lt;td>"/>

-            <body xsi:type="ocl.ecore:PropertyCallExp">

-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-              <source xsi:type="ocl.ecore:VariableExp" name="projectDiscovery" referredVariable="/0/htmlReport/@body.1/@body.17/@body.0/projectDiscovery">

-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-              </source>

-              <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery/name"/>

-            </body>

-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;/td>&#xA;            &lt;td>"/>

-            <body xsi:type="mtl:QueryInvocation" definition="/0/timeWithUnit">

-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-              <argument xsi:type="ocl.ecore:OperationCallExp">

-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-                <source xsi:type="ocl.ecore:RealLiteralExp" realSymbol="0.0">

-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-                </source>

-                <argument xsi:type="ocl.ecore:PropertyCallExp">

-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-                  <source xsi:type="ocl.ecore:VariableExp" name="averagedDiscovery" referredVariable="/0/htmlReport/@body.1/@body.17/averagedDiscovery">

-                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery"/>

-                  </source>

-                  <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery/averageExecutionTimeInSeconds"/>

-                </argument>

-                <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real_Class/+"/>

-              </argument>

-            </body>

-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" (&amp;sigma; = "/>

-            <body xsi:type="ocl.ecore:PropertyCallExp">

-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-              <source xsi:type="ocl.ecore:VariableExp" name="averagedDiscovery" referredVariable="/0/htmlReport/@body.1/@body.17/averagedDiscovery">

-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery"/>

-              </source>

-              <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery/executionTimeStandardDeviation"/>

-            </body>

-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="s)&lt;/td>&#xA;            &lt;td>"/>

-            <body xsi:type="mtl:QueryInvocation" definition="/0/timeWithUnit">

-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-              <argument xsi:type="ocl.ecore:OperationCallExp">

-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-                <source xsi:type="ocl.ecore:RealLiteralExp" realSymbol="0.0">

-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-                </source>

-                <argument xsi:type="ocl.ecore:PropertyCallExp">

-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-                  <source xsi:type="ocl.ecore:VariableExp" name="averagedDiscovery" referredVariable="/0/htmlReport/@body.1/@body.17/averagedDiscovery">

-                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery"/>

-                  </source>

-                  <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery/averageSaveTimeInSeconds"/>

-                </argument>

-                <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real_Class/+"/>

-              </argument>

-            </body>

-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" (&amp;sigma; = "/>

-            <body xsi:type="ocl.ecore:PropertyCallExp">

-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-              <source xsi:type="ocl.ecore:VariableExp" name="averagedDiscovery" referredVariable="/0/htmlReport/@body.1/@body.17/averagedDiscovery">

-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery"/>

-              </source>

-              <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery/saveTimeStandardDeviation"/>

-            </body>

-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="s)&lt;/td>&#xA;            &lt;td>"/>

-            <body xsi:type="ocl.ecore:PropertyCallExp">

-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>

-              <source xsi:type="ocl.ecore:VariableExp" name="projectDiscovery" referredVariable="/0/htmlReport/@body.1/@body.17/@body.0/projectDiscovery">

-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-              </source>

-              <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery/numberOfModelElements"/>

-            </body>

-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;/td>&#xA;            &lt;td>"/>

-            <body xsi:type="mtl:QueryInvocation" definition="/0/sizeWithUnit">

-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-              <argument xsi:type="ocl.ecore:OperationCallExp">

-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-                <source xsi:type="ocl.ecore:RealLiteralExp" realSymbol="0.0">

-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-                </source>

-                <argument xsi:type="ocl.ecore:PropertyCallExp">

-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>

-                  <source xsi:type="ocl.ecore:OperationCallExp">

-                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Project"/>

-                    <source xsi:type="ocl.ecore:PropertyCallExp" eType="/3/OrderedSet(Project)">

-                      <source xsi:type="ocl.ecore:VariableExp" name="projectDiscovery" referredVariable="/0/htmlReport/@body.1/@body.17/@body.0/projectDiscovery">

-                        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-                      </source>

-                      <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery/projects"/>

-                    </source>

-                    <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)_Class/first"/>

-                  </source>

-                  <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Project/totalSizeInBytes"/>

-                </argument>

-                <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real_Class/+"/>

-              </argument>

-            </body>

-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;/td>&#xA;            &lt;td>"/>

-            <body xsi:type="mtl:QueryInvocation" definition="/0/sizeWithUnit">

-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-              <argument xsi:type="ocl.ecore:OperationCallExp">

-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-                <source xsi:type="ocl.ecore:RealLiteralExp" realSymbol="0.0">

-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-                </source>

-                <argument xsi:type="ocl.ecore:PropertyCallExp">

-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>

-                  <source xsi:type="ocl.ecore:OperationCallExp">

-                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Project"/>

-                    <source xsi:type="ocl.ecore:PropertyCallExp" eType="/3/OrderedSet(Project)">

-                      <source xsi:type="ocl.ecore:VariableExp" name="projectDiscovery" referredVariable="/0/htmlReport/@body.1/@body.17/@body.0/projectDiscovery">

-                        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-                      </source>

-                      <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery/projects"/>

-                    </source>

-                    <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)_Class/first"/>

-                  </source>

-                  <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Project/averageFileSizeInBytes"/>

-                </argument>

-                <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real_Class/+"/>

-              </argument>

-            </body>

-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;/td>&#xA;            &lt;td>"/>

-            <body xsi:type="ocl.ecore:PropertyCallExp">

-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>

-              <source xsi:type="ocl.ecore:OperationCallExp">

-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Project"/>

-                <source xsi:type="ocl.ecore:PropertyCallExp" eType="/3/OrderedSet(Project)">

-                  <source xsi:type="ocl.ecore:VariableExp" name="projectDiscovery" referredVariable="/0/htmlReport/@body.1/@body.17/@body.0/projectDiscovery">

-                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-                  </source>

-                  <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery/projects"/>

-                </source>

-                <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)_Class/first"/>

-              </source>

-              <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Project/totalLines"/>

-            </body>

-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;/td>&#xA;            &lt;td>"/>

-            <body xsi:type="ocl.ecore:PropertyCallExp">

-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>

-              <source xsi:type="ocl.ecore:OperationCallExp">

-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Project"/>

-                <source xsi:type="ocl.ecore:PropertyCallExp" eType="/3/OrderedSet(Project)">

-                  <source xsi:type="ocl.ecore:VariableExp" name="projectDiscovery" referredVariable="/0/htmlReport/@body.1/@body.17/@body.0/projectDiscovery">

-                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-                  </source>

-                  <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery/projects"/>

-                </source>

-                <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)_Class/first"/>

-              </source>

-              <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Project/averageLinesPerFile"/>

-            </body>

-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;/td>&#xA;            &lt;td>"/>

-            <body xsi:type="mtl:QueryInvocation" definition="/0/sizeWithUnit">

-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-              <argument xsi:type="ocl.ecore:OperationCallExp">

-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-                <source xsi:type="ocl.ecore:RealLiteralExp" realSymbol="0.0">

-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-                </source>

-                <argument xsi:type="ocl.ecore:PropertyCallExp">

-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>

-                  <source xsi:type="ocl.ecore:VariableExp" name="projectDiscovery" referredVariable="/0/htmlReport/@body.1/@body.17/@body.0/projectDiscovery">

-                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-                  </source>

-                  <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery/xmiSizeInBytes"/>

-                </argument>

-                <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real_Class/+"/>

-              </argument>

-            </body>

-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;/td>&#xA;         &lt;/tr>&#xA;"/>

-            <letVariable name="projectDiscovery">

-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-              <initExpression xsi:type="ocl.ecore:OperationCallExp">

-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-                <source xsi:type="ocl.ecore:PropertyCallExp" eType="/3/OrderedSet(ProjectDiscovery)">

-                  <source xsi:type="ocl.ecore:VariableExp" name="averagedDiscovery" referredVariable="/0/htmlReport/@body.1/@body.17/averagedDiscovery">

-                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery"/>

-                  </source>

-                  <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery/occurrences"/>

-                </source>

-                <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)_Class/first"/>

-              </initExpression>

-            </letVariable>

-          </body>

-          <loopVariable name="averagedDiscovery">

-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery"/>

-          </loopVariable>

-          <iterSet xsi:type="ocl.ecore:PropertyCallExp" eType="/3/OrderedSet(AveragedProjectDiscovery)">

-            <source xsi:type="ocl.ecore:VariableExp" name="b" referredVariable="/0/htmlReport/b">

-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedMultiDiscoveryBenchmark"/>

-            </source>

-            <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedMultiDiscoveryBenchmark/discoveries"/>

-          </iterSet>

-        </body>

-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="  &lt;/table>&#xA;&#xA;"/>

-        <body xsi:type="mtl:IfBlock">

-          <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;h2>Execution times per iteration&lt;/h2>&#xA;&#xA;"/>

-          <body xsi:type="mtl:ForBlock">

-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;h3>"/>

-            <body xsi:type="ocl.ecore:PropertyCallExp">

-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-              <source xsi:type="ocl.ecore:OperationCallExp">

-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-                <source xsi:type="ocl.ecore:PropertyCallExp" eType="/3/OrderedSet(ProjectDiscovery)">

-                  <source xsi:type="ocl.ecore:VariableExp" name="averagedDiscovery" referredVariable="/0/htmlReport/@body.1/@body.19/@body.1/averagedDiscovery">

-                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery"/>

-                  </source>

-                  <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery/occurrences"/>

-                </source>

-                <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)_Class/first"/>

-              </source>

-              <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery/name"/>

-            </body>

-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;/h3>&#xA;"/>

-            <body xsi:type="mtl:LetBlock">

-              <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;&lt;table width=&quot;600&quot; class=&quot;graph&quot; cellspacing=&quot;6&quot; cellpadding=&quot;0&quot;>&#xA;  &lt;tr>&#xA;    &lt;th>iteration&lt;/th>&lt;th>relative execution time&lt;/th>&lt;th>time&lt;/th>&#xA;  &lt;/tr>&#xA;&#xA;"/>

-              <body xsi:type="mtl:ForBlock">

-                <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="    &lt;tr>&#xA;      &lt;td>"/>

-                <body xsi:type="ocl.ecore:VariableExp" name="i">

-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>

-                </body>

-                <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="/"/>

-                <body xsi:type="ocl.ecore:OperationCallExp">

-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>

-                  <source xsi:type="ocl.ecore:PropertyCallExp" eType="/3/OrderedSet(ProjectDiscovery)">

-                    <source xsi:type="ocl.ecore:VariableExp" name="averagedDiscovery" referredVariable="/0/htmlReport/@body.1/@body.19/@body.1/averagedDiscovery">

-                      <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery"/>

-                    </source>

-                    <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery/occurrences"/>

-                  </source>

-                  <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)_Class/size"/>

-                </body>

-                <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;/td>&lt;td class=&quot;bar&quot;>&lt;div style=&quot;width: "/>

-                <body xsi:type="ocl.ecore:OperationCallExp">

-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-                  <source xsi:type="ocl.ecore:OperationCallExp">

-                    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-                    <source xsi:type="ocl.ecore:PropertyCallExp">

-                      <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-                      <source xsi:type="ocl.ecore:VariableExp" name="projectDiscovery" referredVariable="/0/htmlReport/@body.1/@body.19/@body.1/@body.3/@body.1/projectDiscovery">

-                        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-                      </source>

-                      <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery/totalExecutionTimeInSeconds"/>

-                    </source>

-                    <argument xsi:type="ocl.ecore:VariableExp" name="maxExecutionTime" referredVariable="/0/htmlReport/@body.1/@body.19/@body.1/@body.3/maxExecutionTime">

-                      <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-                    </argument>

-                    <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real_Class/%2F"/>

-                  </source>

-                  <argument xsi:type="ocl.ecore:RealLiteralExp" realSymbol="100.0">

-                    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-                  </argument>

-                  <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real_Class/*"/>

-                </body>

-                <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="%&quot;>&lt;/div>&lt;/td>&lt;td>"/>

-                <body xsi:type="mtl:QueryInvocation" definition="/0/timeWithUnit">

-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-                  <argument xsi:type="ocl.ecore:OperationCallExp">

-                    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-                    <source xsi:type="ocl.ecore:RealLiteralExp" realSymbol="0.0">

-                      <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-                    </source>

-                    <argument xsi:type="ocl.ecore:PropertyCallExp">

-                      <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-                      <source xsi:type="ocl.ecore:VariableExp" name="projectDiscovery" referredVariable="/0/htmlReport/@body.1/@body.19/@body.1/@body.3/@body.1/projectDiscovery">

-                        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-                      </source>

-                      <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery/totalExecutionTimeInSeconds"/>

-                    </argument>

-                    <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real_Class/+"/>

-                  </argument>

-                </body>

-                <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;/td>&#xA;    &lt;/tr>&#xA;"/>

-                <loopVariable name="projectDiscovery">

-                  <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-                </loopVariable>

-                <iterSet xsi:type="ocl.ecore:PropertyCallExp" eType="/3/OrderedSet(ProjectDiscovery)">

-                  <source xsi:type="ocl.ecore:VariableExp" name="averagedDiscovery" referredVariable="/0/htmlReport/@body.1/@body.19/@body.1/averagedDiscovery">

-                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery"/>

-                  </source>

-                  <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery/occurrences"/>

-                </iterSet>

-              </body>

-              <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;/table>&#xA;&#xA;"/>

-              <letVariable name="maxExecutionTime">

-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-                <initExpression xsi:type="mtl:QueryInvocation" definition="/0/maxExecutionTime">

-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-                  <argument xsi:type="ocl.ecore:PropertyCallExp" eType="/3/OrderedSet(ProjectDiscovery)">

-                    <source xsi:type="ocl.ecore:VariableExp" name="averagedDiscovery" referredVariable="/0/htmlReport/@body.1/@body.19/@body.1/averagedDiscovery">

-                      <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery"/>

-                    </source>

-                    <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery/occurrences"/>

-                  </argument>

-                </initExpression>

-              </letVariable>

-            </body>

-            <loopVariable name="averagedDiscovery">

-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery"/>

-            </loopVariable>

-            <iterSet xsi:type="ocl.ecore:PropertyCallExp" eType="/3/OrderedSet(AveragedProjectDiscovery)">

-              <source xsi:type="ocl.ecore:VariableExp" name="b" referredVariable="/0/htmlReport/b">

-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedMultiDiscoveryBenchmark"/>

-              </source>

-              <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedMultiDiscoveryBenchmark/discoveries"/>

-            </iterSet>

-          </body>

-          <ifExpr xsi:type="ocl.ecore:OperationCallExp">

-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>

-            <source xsi:type="ocl.ecore:OperationCallExp">

-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>

-              <source xsi:type="ocl.ecore:PropertyCallExp" eType="/3/OrderedSet(ProjectDiscovery)">

-                <source xsi:type="ocl.ecore:OperationCallExp">

-                  <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery"/>

-                  <source xsi:type="ocl.ecore:PropertyCallExp" eType="/3/OrderedSet(AveragedProjectDiscovery)">

-                    <source xsi:type="ocl.ecore:VariableExp" name="b" referredVariable="/0/htmlReport/b">

-                      <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedMultiDiscoveryBenchmark"/>

-                    </source>

-                    <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedMultiDiscoveryBenchmark/discoveries"/>

-                  </source>

-                  <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)_Class/first"/>

-                </source>

-                <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery/occurrences"/>

-              </source>

-              <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)_Class/size"/>

-            </source>

-            <argument xsi:type="ocl.ecore:IntegerLiteralExp" integerSymbol="1">

-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>

-            </argument>

-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer_Class/%3E"/>

-          </ifExpr>

-        </body>

-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;"/>

-        <body xsi:type="mtl:IfBlock">

-          <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;h2>Save times per iteration&lt;/h2>&#xA;&#xA;"/>

-          <body xsi:type="mtl:ForBlock">

-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;h3>"/>

-            <body xsi:type="ocl.ecore:PropertyCallExp">

-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-              <source xsi:type="ocl.ecore:OperationCallExp">

-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-                <source xsi:type="ocl.ecore:PropertyCallExp" eType="/3/OrderedSet(ProjectDiscovery)">

-                  <source xsi:type="ocl.ecore:VariableExp" name="averagedDiscovery" referredVariable="/0/htmlReport/@body.1/@body.21/@body.1/averagedDiscovery">

-                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery"/>

-                  </source>

-                  <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery/occurrences"/>

-                </source>

-                <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)_Class/first"/>

-              </source>

-              <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery/name"/>

-            </body>

-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;/h3>&#xA;"/>

-            <body xsi:type="mtl:LetBlock">

-              <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;&lt;table width=&quot;600&quot; class=&quot;graph&quot; cellspacing=&quot;6&quot; cellpadding=&quot;0&quot;>&#xA;  &lt;tr>&#xA;    &lt;th>iteration&lt;/th>&lt;th>relative save time&lt;/th>&lt;th>time(s)&lt;/th>&#xA;  &lt;/tr>&#xA;&#xA;"/>

-              <body xsi:type="mtl:ForBlock">

-                <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="    &lt;tr>&#xA;      &lt;td>"/>

-                <body xsi:type="ocl.ecore:VariableExp" name="i">

-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>

-                </body>

-                <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="/"/>

-                <body xsi:type="ocl.ecore:OperationCallExp">

-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>

-                  <source xsi:type="ocl.ecore:PropertyCallExp" eType="/3/OrderedSet(ProjectDiscovery)">

-                    <source xsi:type="ocl.ecore:VariableExp" name="averagedDiscovery" referredVariable="/0/htmlReport/@body.1/@body.21/@body.1/averagedDiscovery">

-                      <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery"/>

-                    </source>

-                    <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery/occurrences"/>

-                  </source>

-                  <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)_Class/size"/>

-                </body>

-                <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;/td>&lt;td class=&quot;bar&quot;>&lt;div style=&quot;width: "/>

-                <body xsi:type="ocl.ecore:OperationCallExp">

-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-                  <source xsi:type="ocl.ecore:OperationCallExp">

-                    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-                    <source xsi:type="ocl.ecore:PropertyCallExp">

-                      <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-                      <source xsi:type="ocl.ecore:VariableExp" name="projectDiscovery" referredVariable="/0/htmlReport/@body.1/@body.21/@body.1/@body.3/@body.1/projectDiscovery">

-                        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-                      </source>

-                      <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery/saveTimeInSeconds"/>

-                    </source>

-                    <argument xsi:type="ocl.ecore:VariableExp" name="maxSaveTime" referredVariable="/0/htmlReport/@body.1/@body.21/@body.1/@body.3/maxSaveTime">

-                      <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-                    </argument>

-                    <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real_Class/%2F"/>

-                  </source>

-                  <argument xsi:type="ocl.ecore:RealLiteralExp" realSymbol="100.0">

-                    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-                  </argument>

-                  <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real_Class/*"/>

-                </body>

-                <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="%&quot;>&lt;/div>&lt;/td>&lt;td>"/>

-                <body xsi:type="mtl:QueryInvocation" definition="/0/timeWithUnit">

-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-                  <argument xsi:type="ocl.ecore:OperationCallExp">

-                    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-                    <source xsi:type="ocl.ecore:RealLiteralExp" realSymbol="0.0">

-                      <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-                    </source>

-                    <argument xsi:type="ocl.ecore:PropertyCallExp">

-                      <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-                      <source xsi:type="ocl.ecore:VariableExp" name="projectDiscovery" referredVariable="/0/htmlReport/@body.1/@body.21/@body.1/@body.3/@body.1/projectDiscovery">

-                        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-                      </source>

-                      <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery/saveTimeInSeconds"/>

-                    </argument>

-                    <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real_Class/+"/>

-                  </argument>

-                </body>

-                <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;/td>&#xA;    &lt;/tr>&#xA;"/>

-                <loopVariable name="projectDiscovery">

-                  <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-                </loopVariable>

-                <iterSet xsi:type="ocl.ecore:PropertyCallExp" eType="/3/OrderedSet(ProjectDiscovery)">

-                  <source xsi:type="ocl.ecore:VariableExp" name="averagedDiscovery" referredVariable="/0/htmlReport/@body.1/@body.21/@body.1/averagedDiscovery">

-                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery"/>

-                  </source>

-                  <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery/occurrences"/>

-                </iterSet>

-              </body>

-              <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;/table>&#xA;&#xA;"/>

-              <letVariable name="maxSaveTime">

-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-                <initExpression xsi:type="mtl:QueryInvocation" definition="/0/maxSaveTime">

-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-                  <argument xsi:type="ocl.ecore:PropertyCallExp" eType="/3/OrderedSet(ProjectDiscovery)">

-                    <source xsi:type="ocl.ecore:VariableExp" name="averagedDiscovery" referredVariable="/0/htmlReport/@body.1/@body.21/@body.1/averagedDiscovery">

-                      <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery"/>

-                    </source>

-                    <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery/occurrences"/>

-                  </argument>

-                </initExpression>

-              </letVariable>

-            </body>

-            <loopVariable name="averagedDiscovery">

-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery"/>

-            </loopVariable>

-            <iterSet xsi:type="ocl.ecore:PropertyCallExp" eType="/3/OrderedSet(AveragedProjectDiscovery)">

-              <source xsi:type="ocl.ecore:VariableExp" name="b" referredVariable="/0/htmlReport/b">

-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedMultiDiscoveryBenchmark"/>

-              </source>

-              <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedMultiDiscoveryBenchmark/discoveries"/>

-            </iterSet>

-          </body>

-          <ifExpr xsi:type="ocl.ecore:OperationCallExp">

-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>

-            <source xsi:type="ocl.ecore:OperationCallExp">

-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>

-              <source xsi:type="ocl.ecore:PropertyCallExp" eType="/3/OrderedSet(ProjectDiscovery)">

-                <source xsi:type="ocl.ecore:OperationCallExp">

-                  <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery"/>

-                  <source xsi:type="ocl.ecore:PropertyCallExp" eType="/3/OrderedSet(AveragedProjectDiscovery)">

-                    <source xsi:type="ocl.ecore:VariableExp" name="b" referredVariable="/0/htmlReport/b">

-                      <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedMultiDiscoveryBenchmark"/>

-                    </source>

-                    <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedMultiDiscoveryBenchmark/discoveries"/>

-                  </source>

-                  <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)_Class/first"/>

-                </source>

-                <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery/occurrences"/>

-              </source>

-              <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)_Class/size"/>

-            </source>

-            <argument xsi:type="ocl.ecore:IntegerLiteralExp" integerSymbol="1">

-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>

-            </argument>

-            <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer_Class/%3E"/>

-          </ifExpr>

-        </body>

-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;&lt;h2>Detailed Results&lt;/h2>&#xA;"/>

-        <body xsi:type="mtl:ForBlock">

-          <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;h3>"/>

-          <body xsi:type="ocl.ecore:PropertyCallExp">

-            <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-            <source xsi:type="ocl.ecore:OperationCallExp">

-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-              <source xsi:type="ocl.ecore:PropertyCallExp" eType="/3/OrderedSet(ProjectDiscovery)">

-                <source xsi:type="ocl.ecore:VariableExp" name="averagedDiscovery" referredVariable="/0/htmlReport/@body.1/@body.23/averagedDiscovery">

-                  <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery"/>

-                </source>

-                <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery/occurrences"/>

-              </source>

-              <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)_Class/first"/>

-            </source>

-            <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery/name"/>

-          </body>

-          <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;/h3>&#xA;"/>

-          <body xsi:type="mtl:ForBlock">

-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;h4>iteration "/>

-            <body xsi:type="ocl.ecore:VariableExp" name="i">

-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>

-            </body>

-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;/h4>&#xA;&lt;b>name&lt;/b>: "/>

-            <body xsi:type="ocl.ecore:PropertyCallExp">

-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-              <source xsi:type="ocl.ecore:VariableExp" name="projectDiscovery" referredVariable="/0/htmlReport/@body.1/@body.23/@body.3/projectDiscovery">

-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-              </source>

-              <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery/name"/>

-            </body>

-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;br/>&#xA;&lt;b>date&lt;/b>: "/>

-            <body xsi:type="ocl.ecore:PropertyCallExp">

-              <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EDate"/>

-              <source xsi:type="ocl.ecore:VariableExp" name="projectDiscovery" referredVariable="/0/htmlReport/@body.1/@body.23/@body.3/projectDiscovery">

-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-              </source>

-              <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery/dicoveryDate"/>

-            </body>

-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;br/>&#xA;&lt;b>algorithm&lt;/b>: "/>

-            <body xsi:type="ocl.ecore:PropertyCallExp">

-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-              <source xsi:type="ocl.ecore:VariableExp" name="projectDiscovery" referredVariable="/0/htmlReport/@body.1/@body.23/@body.3/projectDiscovery">

-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-              </source>

-              <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery/algorithmVariant"/>

-            </body>

-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;br/>&#xA;&lt;b>discoverer&lt;/b>: "/>

-            <body xsi:type="ocl.ecore:PropertyCallExp">

-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-              <source xsi:type="ocl.ecore:VariableExp" name="projectDiscovery" referredVariable="/0/htmlReport/@body.1/@body.23/@body.3/projectDiscovery">

-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-              </source>

-              <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery/discovererId"/>

-            </body>

-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=" ("/>

-            <body xsi:type="ocl.ecore:PropertyCallExp">

-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-              <source xsi:type="ocl.ecore:VariableExp" name="projectDiscovery" referredVariable="/0/htmlReport/@body.1/@body.23/@body.3/projectDiscovery">

-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-              </source>

-              <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery/discovererClassName"/>

-            </body>

-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol=")&lt;br/>&#xA;&lt;b>save time&lt;/b>: "/>

-            <body xsi:type="mtl:QueryInvocation" definition="/0/timeWithUnit">

-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-              <argument xsi:type="ocl.ecore:OperationCallExp">

-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-                <source xsi:type="ocl.ecore:RealLiteralExp" realSymbol="0.0">

-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-                </source>

-                <argument xsi:type="ocl.ecore:PropertyCallExp">

-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-                  <source xsi:type="ocl.ecore:VariableExp" name="projectDiscovery" referredVariable="/0/htmlReport/@body.1/@body.23/@body.3/projectDiscovery">

-                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-                  </source>

-                  <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery/saveTimeInSeconds"/>

-                </argument>

-                <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real_Class/+"/>

-              </argument>

-            </body>

-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;br/>&#xA;&lt;b>execution time&lt;/b>: "/>

-            <body xsi:type="mtl:QueryInvocation" definition="/0/timeWithUnit">

-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-              <argument xsi:type="ocl.ecore:OperationCallExp">

-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-                <source xsi:type="ocl.ecore:RealLiteralExp" realSymbol="0.0">

-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-                </source>

-                <argument xsi:type="ocl.ecore:PropertyCallExp">

-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-                  <source xsi:type="ocl.ecore:VariableExp" name="projectDiscovery" referredVariable="/0/htmlReport/@body.1/@body.23/@body.3/projectDiscovery">

-                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-                  </source>

-                  <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery/totalExecutionTimeInSeconds"/>

-                </argument>

-                <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real_Class/+"/>

-              </argument>

-            </body>

-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;br/>&#xA;&lt;b>metamodel variant&lt;/b>: "/>

-            <body xsi:type="ocl.ecore:PropertyCallExp">

-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-              <source xsi:type="ocl.ecore:VariableExp" name="projectDiscovery" referredVariable="/0/htmlReport/@body.1/@body.23/@body.3/projectDiscovery">

-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-              </source>

-              <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery/metaModelVariant"/>

-            </body>

-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;br/>&#xA;&lt;b>max used memory&lt;/b>: "/>

-            <body xsi:type="mtl:QueryInvocation" definition="/0/sizeWithUnit">

-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-              <argument xsi:type="ocl.ecore:OperationCallExp">

-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-                <source xsi:type="ocl.ecore:RealLiteralExp" realSymbol="0.0">

-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-                </source>

-                <argument xsi:type="ocl.ecore:PropertyCallExp">

-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>

-                  <source xsi:type="ocl.ecore:VariableExp" name="projectDiscovery" referredVariable="/0/htmlReport/@body.1/@body.23/@body.3/projectDiscovery">

-                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-                  </source>

-                  <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery/maxUsedMemoryInBytes"/>

-                </argument>

-                <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real_Class/+"/>

-              </argument>

-            </body>

-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;br/>&#xA;&lt;b>number of model elements&lt;/b>: "/>

-            <body xsi:type="ocl.ecore:PropertyCallExp">

-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>

-              <source xsi:type="ocl.ecore:VariableExp" name="projectDiscovery" referredVariable="/0/htmlReport/@body.1/@body.23/@body.3/projectDiscovery">

-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-              </source>

-              <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery/numberOfModelElements"/>

-            </body>

-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;br/>&#xA;&lt;b>XMI file size&lt;/b>: "/>

-            <body xsi:type="mtl:QueryInvocation" definition="/0/sizeWithUnit">

-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-              <argument xsi:type="ocl.ecore:OperationCallExp">

-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-                <source xsi:type="ocl.ecore:RealLiteralExp" realSymbol="0.0">

-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-                </source>

-                <argument xsi:type="ocl.ecore:PropertyCallExp">

-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>

-                  <source xsi:type="ocl.ecore:VariableExp" name="projectDiscovery" referredVariable="/0/htmlReport/@body.1/@body.23/@body.3/projectDiscovery">

-                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-                  </source>

-                  <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery/xmiSizeInBytes"/>

-                </argument>

-                <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real_Class/+"/>

-              </argument>

-            </body>

-            <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;br/>&#xA;"/>

-            <body xsi:type="mtl:IfBlock">

-              <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;b>Discovery error&lt;/b>:&lt;br/>&#xA;&lt;font color=&quot;red&quot;>"/>

-              <body xsi:type="mtl:QueryInvocation" definition="/0/lfToBr">

-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-                <argument xsi:type="ocl.ecore:PropertyCallExp">

-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-                  <source xsi:type="ocl.ecore:VariableExp" name="projectDiscovery" referredVariable="/0/htmlReport/@body.1/@body.23/@body.3/projectDiscovery">

-                    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-                  </source>

-                  <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery/discoveryError"/>

-                </argument>

-              </body>

-              <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;/font>&#xA;"/>

-              <ifExpr xsi:type="ocl.ecore:OperationCallExp">

-                <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>

-                <source xsi:type="ocl.ecore:OperationCallExp">

-                  <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>

-                  <source xsi:type="ocl.ecore:PropertyCallExp">

-                    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-                    <source xsi:type="ocl.ecore:VariableExp" name="projectDiscovery" referredVariable="/0/htmlReport/@body.1/@body.23/@body.3/projectDiscovery">

-                      <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-                    </source>

-                    <referredProperty xsi:type="ecore:EAttribute" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery/discoveryError"/>

-                  </source>

-                  <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String_Class/oclIsUndefined"/>

-                </source>

-                <referredOperation xsi:type="ecore:EOperation" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean_Class/not"/>

-              </ifExpr>

-            </body>

-            <loopVariable name="projectDiscovery">

-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-            </loopVariable>

-            <iterSet xsi:type="ocl.ecore:PropertyCallExp" eType="/3/OrderedSet(ProjectDiscovery)">

-              <source xsi:type="ocl.ecore:VariableExp" name="averagedDiscovery" referredVariable="/0/htmlReport/@body.1/@body.23/averagedDiscovery">

-                <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery"/>

-              </source>

-              <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery/occurrences"/>

-            </iterSet>

-            <each xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&lt;hr/>">

-              <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-            </each>

-          </body>

-          <loopVariable name="averagedDiscovery">

-            <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery"/>

-          </loopVariable>

-          <iterSet xsi:type="ocl.ecore:PropertyCallExp" eType="/3/OrderedSet(AveragedProjectDiscovery)">

-            <source xsi:type="ocl.ecore:VariableExp" name="b" referredVariable="/0/htmlReport/b">

-              <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedMultiDiscoveryBenchmark"/>

-            </source>

-            <referredProperty xsi:type="ecore:EReference" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedMultiDiscoveryBenchmark/discoveries"/>

-          </iterSet>

-        </body>

-        <body xsi:type="ocl.ecore:StringLiteralExp" stringSymbol="&#xA;&lt;p/>&#xA;&lt;hr/>&#xA;&lt;font size=&quot;-1&quot;>&lt;i>This report has been generated with &lt;a href=&quot;http://www.eclipse.org/MoDisco/&quot;>MoDisco&lt;/a> Java Discoverer Benchmark.&lt;/i>&lt;/font>&#xA;&lt;/body>&lt;/html>&#xA;"/>

-        <fileUrl xsi:type="ocl.ecore:VariableExp" name="targetFileName" referredVariable="/0/htmlReport/targetFileName">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </fileUrl>

-      </body>

-      <parameter name="b">

-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedMultiDiscoveryBenchmark"/>

-      </parameter>

-      <parameter name="targetFileName">

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-      </parameter>

-    </ownedModuleElement>

-  </mtl:Module>

-  <ecore:EPackage name="additions">

-    <eClassifiers xsi:type="ecore:EClass" name="String_Class">

-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">

-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-      </eAnnotations>

-      <eOperations name="substitute">

-        <eAnnotations source="MTL"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        <eParameters name="r">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-        <eParameters name="t">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="index">

-        <eAnnotations source="MTL"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>

-        <eParameters name="r">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="first">

-        <eAnnotations source="MTL"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        <eParameters name="n">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="last">

-        <eAnnotations source="MTL"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        <eParameters name="n">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="strstr">

-        <eAnnotations source="MTL"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>

-        <eParameters name="r">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="strtok">

-        <eAnnotations source="MTL"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        <eParameters name="s1">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-        <eParameters name="flag">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="strcmp">

-        <eAnnotations source="MTL"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>

-        <eParameters name="s1">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="isAlpha">

-        <eAnnotations source="MTL"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>

-      </eOperations>

-      <eOperations name="isAlphanum">

-        <eAnnotations source="MTL"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>

-      </eOperations>

-      <eOperations name="toUpperFirst">

-        <eAnnotations source="MTL"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-      </eOperations>

-      <eOperations name="toLowerFirst">

-        <eAnnotations source="MTL"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-      </eOperations>

-      <eOperations name="replace">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        <eParameters name="substring">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-        <eParameters name="replacement">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="replaceAll">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        <eParameters name="substring">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-        <eParameters name="replacement">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="substituteAll">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        <eParameters name="substring">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-        <eParameters name="replacement">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="startsWith">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>

-        <eParameters name="substring">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="endsWith">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>

-        <eParameters name="substring">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="trim">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-      </eOperations>

-      <eOperations name="tokenize">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(String)"/>

-        <eParameters name="delimiters">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="contains">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>

-        <eParameters name="substring">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="matches">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>

-        <eParameters name="regex">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="lastIndex">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>

-        <eParameters name="substring">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="equalsIgnoreCase">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Boolean"/>

-        <eParameters name="other">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="substring">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        <eParameters name="startIndex">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="+">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        <eParameters name="other">

-          <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="lfToBr">

-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">

-          <contents xsi:type="ocl.ecore:Constraint"/>

-        </eAnnotations>

-        <eAnnotations source="MTL" references="/0/lfToBr"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-      </eOperations>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="Integer_Class">

-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">

-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>

-      </eAnnotations>

-      <eOperations name="toString">

-        <eAnnotations source="MTL"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-      </eOperations>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="Real_Class">

-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">

-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-      </eAnnotations>

-      <eOperations name="toString">

-        <eAnnotations source="MTL"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-      </eOperations>

-      <eOperations name="sizeWithUnit">

-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">

-          <contents xsi:type="ocl.ecore:Constraint"/>

-        </eAnnotations>

-        <eAnnotations source="MTL" references="/0/sizeWithUnit"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-      </eOperations>

-      <eOperations name="timeWithUnit">

-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">

-          <contents xsi:type="ocl.ecore:Constraint"/>

-        </eAnnotations>

-        <eAnnotations source="MTL" references="/0/timeWithUnit"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-      </eOperations>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="EObject_Class">

-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">

-        <references href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

-      </eAnnotations>

-      <eOperations name="eAllContents">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>

-      </eOperations>

-      <eOperations name="eAllContents">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>

-        <eParameters name="filter">

-          <eType xsi:type="ocl.ecore:TypeType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclType"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="ancestors">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>

-      </eOperations>

-      <eOperations name="ancestors">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>

-        <eParameters name="filter">

-          <eType xsi:type="ocl.ecore:TypeType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclType"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="siblings">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>

-      </eOperations>

-      <eOperations name="siblings">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>

-        <eParameters name="filter">

-          <eType xsi:type="ocl.ecore:TypeType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclType"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="eInverse">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:OrderedSetType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//OrderedSet(OclAny)"/>

-      </eOperations>

-      <eOperations name="eInverse">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:OrderedSetType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//OrderedSet(OclAny)"/>

-        <eParameters name="filter">

-          <eType xsi:type="ocl.ecore:TypeType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclType"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="precedingSiblings">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>

-      </eOperations>

-      <eOperations name="precedingSiblings">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>

-        <eParameters name="filter">

-          <eType xsi:type="ocl.ecore:TypeType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclType"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="followingSiblings">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>

-      </eOperations>

-      <eOperations name="followingSiblings">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>

-        <eParameters name="filter">

-          <eType xsi:type="ocl.ecore:TypeType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclType"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="eContainer">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//OclAny"/>

-        <eParameters name="filter">

-          <eType xsi:type="ocl.ecore:TypeType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclType"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="eContents">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>

-        <eParameters name="filter">

-          <eType xsi:type="ocl.ecore:TypeType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclType"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="eGet">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>

-        <eParameters name="featureName">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="maxExecutionTime">

-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">

-          <contents xsi:type="ocl.ecore:Constraint"/>

-        </eAnnotations>

-        <eAnnotations source="MTL" references="/0/maxExecutionTime"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-        <eParameters name="discoveries" eType="/3/Set(Discovery)"/>

-      </eOperations>

-      <eOperations name="maxSaveTime">

-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">

-          <contents xsi:type="ocl.ecore:Constraint"/>

-        </eAnnotations>

-        <eAnnotations source="MTL" references="/0/maxSaveTime"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-        <eParameters name="discoveries" eType="/3/Set(Discovery)"/>

-      </eOperations>

-      <eOperations name="lfToBr">

-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">

-          <contents xsi:type="ocl.ecore:Constraint"/>

-        </eAnnotations>

-        <eAnnotations source="MTL" references="/0/lfToBr"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        <eParameters name="str">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="sizeWithUnit">

-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">

-          <contents xsi:type="ocl.ecore:Constraint"/>

-        </eAnnotations>

-        <eAnnotations source="MTL" references="/0/sizeWithUnit"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        <eParameters name="value">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="timeWithUnit">

-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">

-          <contents xsi:type="ocl.ecore:Constraint"/>

-        </eAnnotations>

-        <eAnnotations source="MTL" references="/0/timeWithUnit"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        <eParameters name="value">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="htmlReport">

-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">

-          <contents xsi:type="ocl.ecore:Constraint"/>

-        </eAnnotations>

-        <eAnnotations source="MTL" references="/0/htmlReport"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        <eParameters name="b">

-          <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedMultiDiscoveryBenchmark"/>

-        </eParameters>

-        <eParameters name="targetFileName">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-      </eOperations>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="OclAny_Class">

-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">

-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>

-      </eAnnotations>

-      <eOperations name="toString">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-      </eOperations>

-      <eOperations name="invoke">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>

-        <eParameters name="class">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-        <eParameters name="method">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-        <eParameters name="arguments">

-          <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="current">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//OclAny"/>

-        <eParameters name="index">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="current">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//OclAny"/>

-        <eParameters name="filter">

-          <eType xsi:type="ocl.ecore:TypeType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclType"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="getProperty">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        <eParameters name="key">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="getProperty">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        <eParameters name="key">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-        <eParameters name="arguments">

-          <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="getProperty">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        <eParameters name="propertiesFileName">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-        <eParameters name="key">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="getProperty">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        <eParameters name="propertiesFileName">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-        <eParameters name="key">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-        <eParameters name="arguments">

-          <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="+">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        <eParameters name="other">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-      </eOperations>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="Collection(T)_Class">

-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">

-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Collection(T)"/>

-      </eAnnotations>

-      <eOperations name="sep">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/acceleo/mtl/3.0/mtlnonstdlib.ecore#//Sequence(OclAny)"/>

-        <eParameters name="separatorString">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-      </eOperations>

-      <eOperations name="filter">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:CollectionType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Collection(T)"/>

-        <eParameters name="filter">

-          <eType xsi:type="ocl.ecore:TypeType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclType"/>

-        </eParameters>

-      </eOperations>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="Sequence(T)_Class">

-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">

-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)"/>

-      </eAnnotations>

-      <eOperations name="reverse">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:SequenceType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Sequence(T)"/>

-      </eOperations>

-      <eOperations name="lastIndexOf">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>

-        <eParameters name="element">

-          <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/T"/>

-        </eParameters>

-      </eOperations>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="OrderedSet(T)_Class">

-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">

-        <references href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)"/>

-      </eAnnotations>

-      <eOperations name="reverse">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:OrderedSetType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OrderedSet(T)"/>

-      </eOperations>

-      <eOperations name="lastIndexOf">

-        <eAnnotations source="MTL non-standard"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Integer"/>

-        <eParameters name="element">

-          <eType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/T"/>

-        </eParameters>

-      </eOperations>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="Set(Discovery)_Class">

-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL" references="/3/Set(Discovery)"/>

-      <eOperations name="maxExecutionTime">

-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">

-          <contents xsi:type="ocl.ecore:Constraint"/>

-        </eAnnotations>

-        <eAnnotations source="MTL" references="/0/maxExecutionTime"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-      </eOperations>

-      <eOperations name="maxSaveTime">

-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">

-          <contents xsi:type="ocl.ecore:Constraint"/>

-        </eAnnotations>

-        <eAnnotations source="MTL" references="/0/maxSaveTime"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-      </eOperations>

-    </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="AveragedMultiDiscoveryBenchmark_Class">

-      <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">

-        <references href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedMultiDiscoveryBenchmark"/>

-      </eAnnotations>

-      <eOperations name="htmlReport">

-        <eAnnotations source="http://www.eclipse.org/ocl/1.1.0/OCL">

-          <contents xsi:type="ocl.ecore:Constraint"/>

-        </eAnnotations>

-        <eAnnotations source="MTL" references="/0/htmlReport"/>

-        <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        <eParameters name="targetFileName">

-          <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-        </eParameters>

-      </eOperations>

-    </eClassifiers>

-  </ecore:EPackage>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

-  </ocl.ecore:Variable>

-  <ecore:EPackage name="collections">

-    <eClassifiers xsi:type="ocl.ecore:SetType" name="Set(Discovery)" instanceClassName="java.util.Set">

-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Discovery"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(Set(Discovery))" instanceClassName="java.util.List" elementType="/3/Set(Discovery)"/>

-    <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(OclAny)" instanceClassName="java.util.List">

-      <elementType xsi:type="ocl.ecore:AnyType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/OclAny"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(String)" instanceClassName="java.util.List">

-      <elementType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ocl.ecore:SequenceType" name="Sequence(Real)" instanceClassName="java.util.List">

-      <elementType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ocl.ecore:OrderedSetType" name="OrderedSet(AveragedProjectDiscovery)" instanceClassName="java.util.LinkedHashSet">

-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ocl.ecore:OrderedSetType" name="OrderedSet(ProjectDiscovery)" instanceClassName="java.util.LinkedHashSet">

-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ocl.ecore:OrderedSetType" name="OrderedSet(Project)" instanceClassName="java.util.LinkedHashSet">

-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//Project"/>

-    </eClassifiers>

-    <eClassifiers xsi:type="ocl.ecore:SetType" instanceClassName="java.util.Set">

-      <elementType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-    </eClassifiers>

-  </ecore:EPackage>

-  <ocl.ecore:Variable name="self" eType="/3/Set(Discovery)"/>

-  <ocl.ecore:Variable name="self" eType="/3/Set(Discovery)"/>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self" eType="/3/Set(Discovery)"/>

-  <ocl.ecore:Variable name="self" eType="/3/Set(Discovery)"/>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/Real"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedMultiDiscoveryBenchmark"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedMultiDiscoveryBenchmark"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedMultiDiscoveryBenchmark"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedMultiDiscoveryBenchmark"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedMultiDiscoveryBenchmark"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedMultiDiscoveryBenchmark"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedMultiDiscoveryBenchmark"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedMultiDiscoveryBenchmark"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedMultiDiscoveryBenchmark"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedMultiDiscoveryBenchmark"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedMultiDiscoveryBenchmark"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedMultiDiscoveryBenchmark"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedMultiDiscoveryBenchmark"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedMultiDiscoveryBenchmark"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedMultiDiscoveryBenchmark"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedMultiDiscoveryBenchmark"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedMultiDiscoveryBenchmark"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedMultiDiscoveryBenchmark"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedMultiDiscoveryBenchmark"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedMultiDiscoveryBenchmark"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//ProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedProjectDiscovery"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/MoDisco/Benchmark/0.9.0/benchmark#//AveragedMultiDiscoveryBenchmark"/>

-  </ocl.ecore:Variable>

-  <ocl.ecore:Variable name="self">

-    <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

-  </ocl.ecore:Variable>

-  <ecore:EAnnotation source="positions">

-    <eAnnotations source="positions.0" references="/0/maxExecutionTime">

-      <details key="start" value="592"/>

-      <details key="end" value="818"/>

-      <details key="line" value="15"/>

-    </eAnnotations>

-    <eAnnotations source="positions.1" references="/0/maxExecutionTime/discoveries">

-      <details key="start" value="624"/>

-      <details key="end" value="652"/>

-      <details key="line" value="15"/>

-    </eAnnotations>

-    <eAnnotations source="positions.2" references="/0/maxExecutionTime/@expression">

-      <details key="start" value="663"/>

-      <details key="end" value="816"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.3" references="/0/maxExecutionTime/@expression/self">

-      <details key="start" value="-1"/>

-      <details key="end" value="-1"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.4" references="/0/maxExecutionTime/@expression/@argument.0">

-      <details key="start" value="670"/>

-      <details key="end" value="750"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.5" references="/0/maxExecutionTime/@expression/@argument.1">

-      <details key="start" value="752"/>

-      <details key="end" value="792"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.6" references="/0/maxExecutionTime/@expression/@argument.2">

-      <details key="start" value="794"/>

-      <details key="end" value="815"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.7" references="/0/maxExecutionTime/@expression/@argument.2/@part.0/discoveries">

-      <details key="start" value="803"/>

-      <details key="end" value="814"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.8" references="/0/maxSaveTime">

-      <details key="start" value="819"/>

-      <details key="end" value="1035"/>

-      <details key="line" value="16"/>

-    </eAnnotations>

-    <eAnnotations source="positions.9" references="/0/maxSaveTime/discoveries">

-      <details key="start" value="846"/>

-      <details key="end" value="874"/>

-      <details key="line" value="16"/>

-    </eAnnotations>

-    <eAnnotations source="positions.10" references="/0/maxSaveTime/@expression">

-      <details key="start" value="885"/>

-      <details key="end" value="1033"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.11" references="/0/maxSaveTime/@expression/self">

-      <details key="start" value="-1"/>

-      <details key="end" value="-1"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.12" references="/0/maxSaveTime/@expression/@argument.0">

-      <details key="start" value="892"/>

-      <details key="end" value="972"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.13" references="/0/maxSaveTime/@expression/@argument.1">

-      <details key="start" value="974"/>

-      <details key="end" value="1009"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.14" references="/0/maxSaveTime/@expression/@argument.2">

-      <details key="start" value="1011"/>

-      <details key="end" value="1032"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.15" references="/0/maxSaveTime/@expression/@argument.2/@part.0/discoveries">

-      <details key="start" value="1020"/>

-      <details key="end" value="1031"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.16" references="/0/lfToBr">

-      <details key="start" value="1036"/>

-      <details key="end" value="1216"/>

-      <details key="line" value="17"/>

-    </eAnnotations>

-    <eAnnotations source="positions.17" references="/0/lfToBr/str">

-      <details key="start" value="1058"/>

-      <details key="end" value="1070"/>

-      <details key="line" value="17"/>

-    </eAnnotations>

-    <eAnnotations source="positions.18" references="/0/lfToBr/@expression">

-      <details key="start" value="1083"/>

-      <details key="end" value="1214"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.19" references="/0/lfToBr/@expression/self">

-      <details key="start" value="-1"/>

-      <details key="end" value="-1"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.20" references="/0/lfToBr/@expression/@argument.0">

-      <details key="start" value="1090"/>

-      <details key="end" value="1170"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.21" references="/0/lfToBr/@expression/@argument.1">

-      <details key="start" value="1172"/>

-      <details key="end" value="1198"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.22" references="/0/lfToBr/@expression/@argument.2">

-      <details key="start" value="1200"/>

-      <details key="end" value="1213"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.23" references="/0/lfToBr/@expression/@argument.2/@part.0/str">

-      <details key="start" value="1209"/>

-      <details key="end" value="1212"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.24" references="/0/sizeWithUnit">

-      <details key="start" value="1217"/>

-      <details key="end" value="1411"/>

-      <details key="line" value="18"/>

-    </eAnnotations>

-    <eAnnotations source="positions.25" references="/0/sizeWithUnit/value">

-      <details key="start" value="1245"/>

-      <details key="end" value="1257"/>

-      <details key="line" value="18"/>

-    </eAnnotations>

-    <eAnnotations source="positions.26" references="/0/sizeWithUnit/@expression">

-      <details key="start" value="1270"/>

-      <details key="end" value="1409"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.27" references="/0/sizeWithUnit/@expression/self">

-      <details key="start" value="-1"/>

-      <details key="end" value="-1"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.28" references="/0/sizeWithUnit/@expression/@argument.0">

-      <details key="start" value="1277"/>

-      <details key="end" value="1357"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.29" references="/0/sizeWithUnit/@expression/@argument.1">

-      <details key="start" value="1359"/>

-      <details key="end" value="1391"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.30" references="/0/sizeWithUnit/@expression/@argument.2">

-      <details key="start" value="1393"/>

-      <details key="end" value="1408"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.31" references="/0/sizeWithUnit/@expression/@argument.2/@part.0/value">

-      <details key="start" value="1402"/>

-      <details key="end" value="1407"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.32" references="/0/timeWithUnit">

-      <details key="start" value="1412"/>

-      <details key="end" value="1606"/>

-      <details key="line" value="19"/>

-    </eAnnotations>

-    <eAnnotations source="positions.33" references="/0/timeWithUnit/value">

-      <details key="start" value="1440"/>

-      <details key="end" value="1452"/>

-      <details key="line" value="19"/>

-    </eAnnotations>

-    <eAnnotations source="positions.34" references="/0/timeWithUnit/@expression">

-      <details key="start" value="1465"/>

-      <details key="end" value="1604"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.35" references="/0/timeWithUnit/@expression/self">

-      <details key="start" value="-1"/>

-      <details key="end" value="-1"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.36" references="/0/timeWithUnit/@expression/@argument.0">

-      <details key="start" value="1472"/>

-      <details key="end" value="1552"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.37" references="/0/timeWithUnit/@expression/@argument.1">

-      <details key="start" value="1554"/>

-      <details key="end" value="1586"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.38" references="/0/timeWithUnit/@expression/@argument.2">

-      <details key="start" value="1588"/>

-      <details key="end" value="1603"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.39" references="/0/timeWithUnit/@expression/@argument.2/@part.0/value">

-      <details key="start" value="1597"/>

-      <details key="end" value="1602"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.40" references="/0/htmlReport">

-      <details key="start" value="1608"/>

-      <details key="end" value="7817"/>

-      <details key="line" value="21"/>

-    </eAnnotations>

-    <eAnnotations source="positions.41" references="/0/htmlReport/@body.0">

-      <details key="start" value="1699"/>

-      <details key="end" value="1700"/>

-      <details key="line" value="22"/>

-    </eAnnotations>

-    <eAnnotations source="positions.42" references="/0/htmlReport/@body.1">

-      <details key="start" value="1718"/>

-      <details key="end" value="7805"/>

-      <details key="line" value="24"/>

-    </eAnnotations>

-    <eAnnotations source="positions.43" references="/0/htmlReport/@body.1/@body.0">

-      <details key="start" value="1749"/>

-      <details key="end" value="2629"/>

-      <details key="line" value="25"/>

-    </eAnnotations>

-    <eAnnotations source="positions.44" references="/0/htmlReport/@body.1/@body.1">

-      <details key="start" value="2630"/>

-      <details key="end" value="2638"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.45" references="/0/htmlReport/@body.1/@body.1/b">

-      <details key="start" value="2630"/>

-      <details key="end" value="2631"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.46" references="/0/htmlReport/@body.1/@body.2">

-      <details key="start" value="2640"/>

-      <details key="end" value="2711"/>

-      <details key="line" value="71"/>

-    </eAnnotations>

-    <eAnnotations source="positions.47" references="/0/htmlReport/@body.1/@body.3">

-      <details key="start" value="2712"/>

-      <details key="end" value="2723"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.48" references="/0/htmlReport/@body.1/@body.3/b">

-      <details key="start" value="2712"/>

-      <details key="end" value="2713"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.49" references="/0/htmlReport/@body.1/@body.4">

-      <details key="start" value="2725"/>

-      <details key="end" value="2801"/>

-      <details key="line" value="76"/>

-    </eAnnotations>

-    <eAnnotations source="positions.50" references="/0/htmlReport/@body.1/@body.5">

-      <details key="start" value="2802"/>

-      <details key="end" value="2818"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.51" references="/0/htmlReport/@body.1/@body.5/b">

-      <details key="start" value="2802"/>

-      <details key="end" value="2803"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.52" references="/0/htmlReport/@body.1/@body.6">

-      <details key="start" value="2820"/>

-      <details key="end" value="2906"/>

-      <details key="line" value="81"/>

-    </eAnnotations>

-    <eAnnotations source="positions.53" references="/0/htmlReport/@body.1/@body.7">

-      <details key="start" value="2907"/>

-      <details key="end" value="2923"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.54" references="/0/htmlReport/@body.1/@body.7/b">

-      <details key="start" value="2907"/>

-      <details key="end" value="2908"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.55" references="/0/htmlReport/@body.1/@body.8">

-      <details key="start" value="2925"/>

-      <details key="end" value="2993"/>

-      <details key="line" value="86"/>

-    </eAnnotations>

-    <eAnnotations source="positions.56" references="/0/htmlReport/@body.1/@body.9">

-      <details key="start" value="2994"/>

-      <details key="end" value="3009"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.57" references="/0/htmlReport/@body.1/@body.9/b">

-      <details key="start" value="2994"/>

-      <details key="end" value="2995"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.58" references="/0/htmlReport/@body.1/@body.10">

-      <details key="start" value="3011"/>

-      <details key="end" value="3086"/>

-      <details key="line" value="91"/>

-    </eAnnotations>

-    <eAnnotations source="positions.59" references="/0/htmlReport/@body.1/@body.11">

-      <details key="start" value="3087"/>

-      <details key="end" value="3109"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.60" references="/0/htmlReport/@body.1/@body.11/b">

-      <details key="start" value="3087"/>

-      <details key="end" value="3088"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.61" references="/0/htmlReport/@body.1/@body.12">

-      <details key="start" value="3111"/>

-      <details key="end" value="3185"/>

-      <details key="line" value="96"/>

-    </eAnnotations>

-    <eAnnotations source="positions.62" references="/0/htmlReport/@body.1/@body.13">

-      <details key="start" value="3186"/>

-      <details key="end" value="3206"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.63" references="/0/htmlReport/@body.1/@body.13/b">

-      <details key="start" value="3186"/>

-      <details key="end" value="3187"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.64" references="/0/htmlReport/@body.1/@body.14">

-      <details key="start" value="3208"/>

-      <details key="end" value="3275"/>

-      <details key="line" value="101"/>

-    </eAnnotations>

-    <eAnnotations source="positions.65" references="/0/htmlReport/@body.1/@body.15">

-      <details key="start" value="3276"/>

-      <details key="end" value="3290"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.66" references="/0/htmlReport/@body.1/@body.15/b">

-      <details key="start" value="3276"/>

-      <details key="end" value="3277"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.67" references="/0/htmlReport/@body.1/@body.16">

-      <details key="start" value="3292"/>

-      <details key="end" value="3711"/>

-      <details key="line" value="106"/>

-    </eAnnotations>

-    <eAnnotations source="positions.68" references="/0/htmlReport/@body.1/@body.17">

-      <details key="start" value="3716"/>

-      <details key="end" value="4766"/>

-      <details key="line" value="124"/>

-    </eAnnotations>

-    <eAnnotations source="positions.69" references="/0/htmlReport/@body.1/@body.17/@body.0">

-      <details key="start" value="3793"/>

-      <details key="end" value="4754"/>

-      <details key="line" value="125"/>

-    </eAnnotations>

-    <eAnnotations source="positions.70" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.0">

-      <details key="start" value="3876"/>

-      <details key="end" value="3906"/>

-      <details key="line" value="126"/>

-    </eAnnotations>

-    <eAnnotations source="positions.71" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.1">

-      <details key="start" value="3907"/>

-      <details key="end" value="3928"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.72" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.1/projectDiscovery">

-      <details key="start" value="3907"/>

-      <details key="end" value="3923"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.73" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.2">

-      <details key="start" value="3930"/>

-      <details key="end" value="3952"/>

-      <details key="line" value="127"/>

-    </eAnnotations>

-    <eAnnotations source="positions.74" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.3">

-      <details key="start" value="3953"/>

-      <details key="end" value="4020"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.75" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.3/@argument.0">

-      <details key="start" value="3966"/>

-      <details key="end" value="4019"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.76" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.3/@argument.0/@source">

-      <details key="start" value="3966"/>

-      <details key="end" value="3969"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.77" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.3/@argument.0/@argument.0">

-      <details key="start" value="3972"/>

-      <details key="end" value="4019"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.78" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.3/@argument.0/@argument.0/averagedDiscovery">

-      <details key="start" value="3972"/>

-      <details key="end" value="3989"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.79" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.4">

-      <details key="start" value="4022"/>

-      <details key="end" value="4034"/>

-      <details key="line" value="128"/>

-    </eAnnotations>

-    <eAnnotations source="positions.80" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.5">

-      <details key="start" value="4035"/>

-      <details key="end" value="4083"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.81" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.5/averagedDiscovery">

-      <details key="start" value="4035"/>

-      <details key="end" value="4052"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.82" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.6">

-      <details key="start" value="4085"/>

-      <details key="end" value="4109"/>

-      <details key="line" value="128"/>

-    </eAnnotations>

-    <eAnnotations source="positions.83" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.7">

-      <details key="start" value="4110"/>

-      <details key="end" value="4172"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.84" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.7/@argument.0">

-      <details key="start" value="4123"/>

-      <details key="end" value="4171"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.85" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.7/@argument.0/@source">

-      <details key="start" value="4123"/>

-      <details key="end" value="4126"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.86" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.7/@argument.0/@argument.0">

-      <details key="start" value="4129"/>

-      <details key="end" value="4171"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.87" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.7/@argument.0/@argument.0/averagedDiscovery">

-      <details key="start" value="4129"/>

-      <details key="end" value="4146"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.88" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.8">

-      <details key="start" value="4174"/>

-      <details key="end" value="4186"/>

-      <details key="line" value="129"/>

-    </eAnnotations>

-    <eAnnotations source="positions.89" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.9">

-      <details key="start" value="4187"/>

-      <details key="end" value="4230"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.90" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.9/averagedDiscovery">

-      <details key="start" value="4187"/>

-      <details key="end" value="4204"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.91" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.10">

-      <details key="start" value="4232"/>

-      <details key="end" value="4256"/>

-      <details key="line" value="129"/>

-    </eAnnotations>

-    <eAnnotations source="positions.92" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.11">

-      <details key="start" value="4257"/>

-      <details key="end" value="4295"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.93" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.11/projectDiscovery">

-      <details key="start" value="4257"/>

-      <details key="end" value="4273"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.94" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.12">

-      <details key="start" value="4297"/>

-      <details key="end" value="4319"/>

-      <details key="line" value="130"/>

-    </eAnnotations>

-    <eAnnotations source="positions.95" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.13">

-      <details key="start" value="4320"/>

-      <details key="end" value="4391"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.96" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.13/@argument.0">

-      <details key="start" value="4333"/>

-      <details key="end" value="4390"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.97" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.13/@argument.0/@source">

-      <details key="start" value="4333"/>

-      <details key="end" value="4336"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.98" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.13/@argument.0/@argument.0">

-      <details key="start" value="4339"/>

-      <details key="end" value="4390"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.99" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.13/@argument.0/@argument.0/@source">

-      <details key="start" value="4339"/>

-      <details key="end" value="4373"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.100" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.13/@argument.0/@argument.0/@source/@source">

-      <details key="start" value="4339"/>

-      <details key="end" value="4364"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.101" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.13/@argument.0/@argument.0/@source/@source/projectDiscovery">

-      <details key="start" value="4339"/>

-      <details key="end" value="4355"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.102" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.14">

-      <details key="start" value="4393"/>

-      <details key="end" value="4415"/>

-      <details key="line" value="131"/>

-    </eAnnotations>

-    <eAnnotations source="positions.103" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.15">

-      <details key="start" value="4416"/>

-      <details key="end" value="4493"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.104" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.15/@argument.0">

-      <details key="start" value="4429"/>

-      <details key="end" value="4492"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.105" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.15/@argument.0/@source">

-      <details key="start" value="4429"/>

-      <details key="end" value="4432"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.106" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.15/@argument.0/@argument.0">

-      <details key="start" value="4435"/>

-      <details key="end" value="4492"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.107" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.15/@argument.0/@argument.0/@source">

-      <details key="start" value="4435"/>

-      <details key="end" value="4469"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.108" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.15/@argument.0/@argument.0/@source/@source">

-      <details key="start" value="4435"/>

-      <details key="end" value="4460"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.109" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.15/@argument.0/@argument.0/@source/@source/projectDiscovery">

-      <details key="start" value="4435"/>

-      <details key="end" value="4451"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.110" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.16">

-      <details key="start" value="4495"/>

-      <details key="end" value="4517"/>

-      <details key="line" value="132"/>

-    </eAnnotations>

-    <eAnnotations source="positions.111" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.17">

-      <details key="start" value="4518"/>

-      <details key="end" value="4563"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.112" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.17/@source">

-      <details key="start" value="4518"/>

-      <details key="end" value="4552"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.113" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.17/@source/@source">

-      <details key="start" value="4518"/>

-      <details key="end" value="4543"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.114" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.17/@source/@source/projectDiscovery">

-      <details key="start" value="4518"/>

-      <details key="end" value="4534"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.115" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.18">

-      <details key="start" value="4565"/>

-      <details key="end" value="4587"/>

-      <details key="line" value="133"/>

-    </eAnnotations>

-    <eAnnotations source="positions.116" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.19">

-      <details key="start" value="4588"/>

-      <details key="end" value="4642"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.117" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.19/@source">

-      <details key="start" value="4588"/>

-      <details key="end" value="4622"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.118" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.19/@source/@source">

-      <details key="start" value="4588"/>

-      <details key="end" value="4613"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.119" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.19/@source/@source/projectDiscovery">

-      <details key="start" value="4588"/>

-      <details key="end" value="4604"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.120" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.20">

-      <details key="start" value="4644"/>

-      <details key="end" value="4666"/>

-      <details key="line" value="134"/>

-    </eAnnotations>

-    <eAnnotations source="positions.121" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.21">

-      <details key="start" value="4667"/>

-      <details key="end" value="4718"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.122" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.21/@argument.0">

-      <details key="start" value="4680"/>

-      <details key="end" value="4717"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.123" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.21/@argument.0/@source">

-      <details key="start" value="4680"/>

-      <details key="end" value="4683"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.124" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.21/@argument.0/@argument.0">

-      <details key="start" value="4686"/>

-      <details key="end" value="4717"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.125" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.21/@argument.0/@argument.0/projectDiscovery">

-      <details key="start" value="4686"/>

-      <details key="end" value="4702"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.126" references="/0/htmlReport/@body.1/@body.17/@body.0/@body.22">

-      <details key="start" value="4720"/>

-      <details key="end" value="4741"/>

-      <details key="line" value="135"/>

-    </eAnnotations>

-    <eAnnotations source="positions.127" references="/0/htmlReport/@body.1/@body.17/@body.0/projectDiscovery">

-      <details key="start" value="3798"/>

-      <details key="end" value="3874"/>

-      <details key="line" value="125"/>

-    </eAnnotations>

-    <eAnnotations source="positions.128" references="/0/htmlReport/@body.1/@body.17/@body.0/projectDiscovery/@initExpression">

-      <details key="start" value="3837"/>

-      <details key="end" value="3875"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.129" references="/0/htmlReport/@body.1/@body.17/@body.0/projectDiscovery/@initExpression/@source">

-      <details key="start" value="3837"/>

-      <details key="end" value="3866"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.130" references="/0/htmlReport/@body.1/@body.17/@body.0/projectDiscovery/@initExpression/@source/averagedDiscovery">

-      <details key="start" value="3837"/>

-      <details key="end" value="3854"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.131" references="/0/htmlReport/@body.1/@body.17/averagedDiscovery">

-      <details key="start" value="3722"/>

-      <details key="end" value="3766"/>

-      <details key="line" value="124"/>

-    </eAnnotations>

-    <eAnnotations source="positions.132" references="/0/htmlReport/@body.1/@body.17/@iterSet">

-      <details key="start" value="3769"/>

-      <details key="end" value="3782"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.133" references="/0/htmlReport/@body.1/@body.17/@iterSet/b">

-      <details key="start" value="3769"/>

-      <details key="end" value="3770"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.134" references="/0/htmlReport/@body.1/@body.18">

-      <details key="start" value="4767"/>

-      <details key="end" value="4779"/>

-      <details key="line" value="139"/>

-    </eAnnotations>

-    <eAnnotations source="positions.135" references="/0/htmlReport/@body.1/@body.19">

-      <details key="start" value="4779"/>

-      <details key="end" value="5621"/>

-      <details key="line" value="141"/>

-    </eAnnotations>

-    <eAnnotations source="positions.136" references="/0/htmlReport/@body.1/@body.19/@body.0">

-      <details key="start" value="4833"/>

-      <details key="end" value="4873"/>

-      <details key="line" value="142"/>

-    </eAnnotations>

-    <eAnnotations source="positions.137" references="/0/htmlReport/@body.1/@body.19/@body.1">

-      <details key="start" value="4873"/>

-      <details key="end" value="5615"/>

-      <details key="line" value="144"/>

-    </eAnnotations>

-    <eAnnotations source="positions.138" references="/0/htmlReport/@body.1/@body.19/@body.1/@body.0">

-      <details key="start" value="4943"/>

-      <details key="end" value="4947"/>

-      <details key="line" value="145"/>

-    </eAnnotations>

-    <eAnnotations source="positions.139" references="/0/htmlReport/@body.1/@body.19/@body.1/@body.1">

-      <details key="start" value="4948"/>

-      <details key="end" value="4991"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.140" references="/0/htmlReport/@body.1/@body.19/@body.1/@body.1/@source">

-      <details key="start" value="4948"/>

-      <details key="end" value="4986"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.141" references="/0/htmlReport/@body.1/@body.19/@body.1/@body.1/@source/@source">

-      <details key="start" value="4948"/>

-      <details key="end" value="4977"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.142" references="/0/htmlReport/@body.1/@body.19/@body.1/@body.1/@source/@source/averagedDiscovery">

-      <details key="start" value="4948"/>

-      <details key="end" value="4965"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.143" references="/0/htmlReport/@body.1/@body.19/@body.1/@body.2">

-      <details key="start" value="4993"/>

-      <details key="end" value="4999"/>

-      <details key="line" value="145"/>

-    </eAnnotations>

-    <eAnnotations source="positions.144" references="/0/htmlReport/@body.1/@body.19/@body.1/@body.3">

-      <details key="start" value="4999"/>

-      <details key="end" value="5608"/>

-      <details key="line" value="146"/>

-    </eAnnotations>

-    <eAnnotations source="positions.145" references="/0/htmlReport/@body.1/@body.19/@body.1/@body.3/@body.0">

-      <details key="start" value="5079"/>

-      <details key="end" value="5230"/>

-      <details key="line" value="147"/>

-    </eAnnotations>

-    <eAnnotations source="positions.146" references="/0/htmlReport/@body.1/@body.19/@body.1/@body.3/@body.1">

-      <details key="start" value="5230"/>

-      <details key="end" value="5591"/>

-      <details key="line" value="153"/>

-    </eAnnotations>

-    <eAnnotations source="positions.147" references="/0/htmlReport/@body.1/@body.19/@body.1/@body.3/@body.1/@body.0">

-      <details key="start" value="5306"/>

-      <details key="end" value="5325"/>

-      <details key="line" value="154"/>

-    </eAnnotations>

-    <eAnnotations source="positions.148" references="/0/htmlReport/@body.1/@body.19/@body.1/@body.3/@body.1/i">

-      <details key="start" value="5326"/>

-      <details key="end" value="5327"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.149" references="/0/htmlReport/@body.1/@body.19/@body.1/@body.3/@body.1/@body.2">

-      <details key="start" value="5329"/>

-      <details key="end" value="5330"/>

-      <details key="line" value="155"/>

-    </eAnnotations>

-    <eAnnotations source="positions.150" references="/0/htmlReport/@body.1/@body.19/@body.1/@body.3/@body.1/@body.3">

-      <details key="start" value="5331"/>

-      <details key="end" value="5368"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.151" references="/0/htmlReport/@body.1/@body.19/@body.1/@body.3/@body.1/@body.3/@source">

-      <details key="start" value="5331"/>

-      <details key="end" value="5360"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.152" references="/0/htmlReport/@body.1/@body.19/@body.1/@body.3/@body.1/@body.3/@source/averagedDiscovery">

-      <details key="start" value="5331"/>

-      <details key="end" value="5348"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.153" references="/0/htmlReport/@body.1/@body.19/@body.1/@body.3/@body.1/@body.4">

-      <details key="start" value="5370"/>

-      <details key="end" value="5410"/>

-      <details key="line" value="155"/>

-    </eAnnotations>

-    <eAnnotations source="positions.154" references="/0/htmlReport/@body.1/@body.19/@body.1/@body.3/@body.1/@body.5">

-      <details key="start" value="5411"/>

-      <details key="end" value="5482"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.155" references="/0/htmlReport/@body.1/@body.19/@body.1/@body.3/@body.1/@body.5/@source">

-      <details key="start" value="5411"/>

-      <details key="end" value="5474"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.156" references="/0/htmlReport/@body.1/@body.19/@body.1/@body.3/@body.1/@body.5/@source/@source">

-      <details key="start" value="5411"/>

-      <details key="end" value="5455"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.157" references="/0/htmlReport/@body.1/@body.19/@body.1/@body.3/@body.1/@body.5/@source/@source/projectDiscovery">

-      <details key="start" value="5411"/>

-      <details key="end" value="5427"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.158" references="/0/htmlReport/@body.1/@body.19/@body.1/@body.3/@body.1/@body.5/@source/maxExecutionTime">

-      <details key="start" value="5458"/>

-      <details key="end" value="5474"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.159" references="/0/htmlReport/@body.1/@body.19/@body.1/@body.3/@body.1/@body.5/@argument.0">

-      <details key="start" value="5477"/>

-      <details key="end" value="5482"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.160" references="/0/htmlReport/@body.1/@body.19/@body.1/@body.3/@body.1/@body.6">

-      <details key="start" value="5484"/>

-      <details key="end" value="5502"/>

-      <details key="line" value="155"/>

-    </eAnnotations>

-    <eAnnotations source="positions.161" references="/0/htmlReport/@body.1/@body.19/@body.1/@body.3/@body.1/@body.7">

-      <details key="start" value="5503"/>

-      <details key="end" value="5567"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.162" references="/0/htmlReport/@body.1/@body.19/@body.1/@body.3/@body.1/@body.7/@argument.0">

-      <details key="start" value="5516"/>

-      <details key="end" value="5566"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.163" references="/0/htmlReport/@body.1/@body.19/@body.1/@body.3/@body.1/@body.7/@argument.0/@source">

-      <details key="start" value="5516"/>

-      <details key="end" value="5519"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.164" references="/0/htmlReport/@body.1/@body.19/@body.1/@body.3/@body.1/@body.7/@argument.0/@argument.0">

-      <details key="start" value="5522"/>

-      <details key="end" value="5566"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.165" references="/0/htmlReport/@body.1/@body.19/@body.1/@body.3/@body.1/@body.7/@argument.0/@argument.0/projectDiscovery">

-      <details key="start" value="5522"/>

-      <details key="end" value="5538"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.166" references="/0/htmlReport/@body.1/@body.19/@body.1/@body.3/@body.1/@body.8">

-      <details key="start" value="5569"/>

-      <details key="end" value="5585"/>

-      <details key="line" value="155"/>

-    </eAnnotations>

-    <eAnnotations source="positions.167" references="/0/htmlReport/@body.1/@body.19/@body.1/@body.3/@body.1/projectDiscovery">

-      <details key="start" value="5236"/>

-      <details key="end" value="5271"/>

-      <details key="line" value="153"/>

-    </eAnnotations>

-    <eAnnotations source="positions.168" references="/0/htmlReport/@body.1/@body.19/@body.1/@body.3/@body.1/@iterSet">

-      <details key="start" value="5274"/>

-      <details key="end" value="5303"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.169" references="/0/htmlReport/@body.1/@body.19/@body.1/@body.3/@body.1/@iterSet/averagedDiscovery">

-      <details key="start" value="5274"/>

-      <details key="end" value="5291"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.170" references="/0/htmlReport/@body.1/@body.19/@body.1/@body.3/@body.2">

-      <details key="start" value="5592"/>

-      <details key="end" value="5602"/>

-      <details key="line" value="158"/>

-    </eAnnotations>

-    <eAnnotations source="positions.171" references="/0/htmlReport/@body.1/@body.19/@body.1/@body.3/maxExecutionTime">

-      <details key="start" value="5004"/>

-      <details key="end" value="5077"/>

-      <details key="line" value="146"/>

-    </eAnnotations>

-    <eAnnotations source="positions.172" references="/0/htmlReport/@body.1/@body.19/@body.1/@body.3/maxExecutionTime/@initExpression">

-      <details key="start" value="5031"/>

-      <details key="end" value="5078"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.173" references="/0/htmlReport/@body.1/@body.19/@body.1/@body.3/maxExecutionTime/@initExpression/@argument.0">

-      <details key="start" value="5048"/>

-      <details key="end" value="5077"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.174" references="/0/htmlReport/@body.1/@body.19/@body.1/@body.3/maxExecutionTime/@initExpression/@argument.0/averagedDiscovery">

-      <details key="start" value="5048"/>

-      <details key="end" value="5065"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.175" references="/0/htmlReport/@body.1/@body.19/@body.1/averagedDiscovery">

-      <details key="start" value="4879"/>

-      <details key="end" value="4923"/>

-      <details key="line" value="144"/>

-    </eAnnotations>

-    <eAnnotations source="positions.176" references="/0/htmlReport/@body.1/@body.19/@body.1/@iterSet">

-      <details key="start" value="4926"/>

-      <details key="end" value="4939"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.177" references="/0/htmlReport/@body.1/@body.19/@body.1/@iterSet/b">

-      <details key="start" value="4926"/>

-      <details key="end" value="4927"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.178" references="/0/htmlReport/@body.1/@body.19/@ifExpr">

-      <details key="start" value="4783"/>

-      <details key="end" value="4831"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.179" references="/0/htmlReport/@body.1/@body.19/@ifExpr/@source">

-      <details key="start" value="4784"/>

-      <details key="end" value="4826"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.180" references="/0/htmlReport/@body.1/@body.19/@ifExpr/@source/@source">

-      <details key="start" value="4784"/>

-      <details key="end" value="4818"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.181" references="/0/htmlReport/@body.1/@body.19/@ifExpr/@source/@source/@source">

-      <details key="start" value="4784"/>

-      <details key="end" value="4806"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.182" references="/0/htmlReport/@body.1/@body.19/@ifExpr/@source/@source/@source/@source">

-      <details key="start" value="4784"/>

-      <details key="end" value="4797"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.183" references="/0/htmlReport/@body.1/@body.19/@ifExpr/@source/@source/@source/@source/b">

-      <details key="start" value="4784"/>

-      <details key="end" value="4785"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.184" references="/0/htmlReport/@body.1/@body.19/@ifExpr/@argument.0">

-      <details key="start" value="4829"/>

-      <details key="end" value="4830"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.185" references="/0/htmlReport/@body.1/@body.20">

-      <details key="start" value="5622"/>

-      <details key="end" value="5623"/>

-      <details key="line" value="163"/>

-    </eAnnotations>

-    <eAnnotations source="positions.186" references="/0/htmlReport/@body.1/@body.21">

-      <details key="start" value="5623"/>

-      <details key="end" value="6423"/>

-      <details key="line" value="164"/>

-    </eAnnotations>

-    <eAnnotations source="positions.187" references="/0/htmlReport/@body.1/@body.21/@body.0">

-      <details key="start" value="5677"/>

-      <details key="end" value="5712"/>

-      <details key="line" value="165"/>

-    </eAnnotations>

-    <eAnnotations source="positions.188" references="/0/htmlReport/@body.1/@body.21/@body.1">

-      <details key="start" value="5712"/>

-      <details key="end" value="6417"/>

-      <details key="line" value="167"/>

-    </eAnnotations>

-    <eAnnotations source="positions.189" references="/0/htmlReport/@body.1/@body.21/@body.1/@body.0">

-      <details key="start" value="5782"/>

-      <details key="end" value="5786"/>

-      <details key="line" value="168"/>

-    </eAnnotations>

-    <eAnnotations source="positions.190" references="/0/htmlReport/@body.1/@body.21/@body.1/@body.1">

-      <details key="start" value="5787"/>

-      <details key="end" value="5830"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.191" references="/0/htmlReport/@body.1/@body.21/@body.1/@body.1/@source">

-      <details key="start" value="5787"/>

-      <details key="end" value="5825"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.192" references="/0/htmlReport/@body.1/@body.21/@body.1/@body.1/@source/@source">

-      <details key="start" value="5787"/>

-      <details key="end" value="5816"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.193" references="/0/htmlReport/@body.1/@body.21/@body.1/@body.1/@source/@source/averagedDiscovery">

-      <details key="start" value="5787"/>

-      <details key="end" value="5804"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.194" references="/0/htmlReport/@body.1/@body.21/@body.1/@body.2">

-      <details key="start" value="5832"/>

-      <details key="end" value="5838"/>

-      <details key="line" value="168"/>

-    </eAnnotations>

-    <eAnnotations source="positions.195" references="/0/htmlReport/@body.1/@body.21/@body.1/@body.3">

-      <details key="start" value="5838"/>

-      <details key="end" value="6410"/>

-      <details key="line" value="169"/>

-    </eAnnotations>

-    <eAnnotations source="positions.196" references="/0/htmlReport/@body.1/@body.21/@body.1/@body.3/@body.0">

-      <details key="start" value="5908"/>

-      <details key="end" value="6057"/>

-      <details key="line" value="170"/>

-    </eAnnotations>

-    <eAnnotations source="positions.197" references="/0/htmlReport/@body.1/@body.21/@body.1/@body.3/@body.1">

-      <details key="start" value="6057"/>

-      <details key="end" value="6393"/>

-      <details key="line" value="176"/>

-    </eAnnotations>

-    <eAnnotations source="positions.198" references="/0/htmlReport/@body.1/@body.21/@body.1/@body.3/@body.1/@body.0">

-      <details key="start" value="6133"/>

-      <details key="end" value="6152"/>

-      <details key="line" value="177"/>

-    </eAnnotations>

-    <eAnnotations source="positions.199" references="/0/htmlReport/@body.1/@body.21/@body.1/@body.3/@body.1/i">

-      <details key="start" value="6153"/>

-      <details key="end" value="6154"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.200" references="/0/htmlReport/@body.1/@body.21/@body.1/@body.3/@body.1/@body.2">

-      <details key="start" value="6156"/>

-      <details key="end" value="6157"/>

-      <details key="line" value="178"/>

-    </eAnnotations>

-    <eAnnotations source="positions.201" references="/0/htmlReport/@body.1/@body.21/@body.1/@body.3/@body.1/@body.3">

-      <details key="start" value="6158"/>

-      <details key="end" value="6195"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.202" references="/0/htmlReport/@body.1/@body.21/@body.1/@body.3/@body.1/@body.3/@source">

-      <details key="start" value="6158"/>

-      <details key="end" value="6187"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.203" references="/0/htmlReport/@body.1/@body.21/@body.1/@body.3/@body.1/@body.3/@source/averagedDiscovery">

-      <details key="start" value="6158"/>

-      <details key="end" value="6175"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.204" references="/0/htmlReport/@body.1/@body.21/@body.1/@body.3/@body.1/@body.4">

-      <details key="start" value="6197"/>

-      <details key="end" value="6237"/>

-      <details key="line" value="178"/>

-    </eAnnotations>

-    <eAnnotations source="positions.205" references="/0/htmlReport/@body.1/@body.21/@body.1/@body.3/@body.1/@body.5">

-      <details key="start" value="6238"/>

-      <details key="end" value="6294"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.206" references="/0/htmlReport/@body.1/@body.21/@body.1/@body.3/@body.1/@body.5/@source">

-      <details key="start" value="6238"/>

-      <details key="end" value="6286"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.207" references="/0/htmlReport/@body.1/@body.21/@body.1/@body.3/@body.1/@body.5/@source/@source">

-      <details key="start" value="6238"/>

-      <details key="end" value="6272"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.208" references="/0/htmlReport/@body.1/@body.21/@body.1/@body.3/@body.1/@body.5/@source/@source/projectDiscovery">

-      <details key="start" value="6238"/>

-      <details key="end" value="6254"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.209" references="/0/htmlReport/@body.1/@body.21/@body.1/@body.3/@body.1/@body.5/@source/maxSaveTime">

-      <details key="start" value="6275"/>

-      <details key="end" value="6286"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.210" references="/0/htmlReport/@body.1/@body.21/@body.1/@body.3/@body.1/@body.5/@argument.0">

-      <details key="start" value="6289"/>

-      <details key="end" value="6294"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.211" references="/0/htmlReport/@body.1/@body.21/@body.1/@body.3/@body.1/@body.6">

-      <details key="start" value="6296"/>

-      <details key="end" value="6314"/>

-      <details key="line" value="178"/>

-    </eAnnotations>

-    <eAnnotations source="positions.212" references="/0/htmlReport/@body.1/@body.21/@body.1/@body.3/@body.1/@body.7">

-      <details key="start" value="6315"/>

-      <details key="end" value="6369"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.213" references="/0/htmlReport/@body.1/@body.21/@body.1/@body.3/@body.1/@body.7/@argument.0">

-      <details key="start" value="6328"/>

-      <details key="end" value="6368"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.214" references="/0/htmlReport/@body.1/@body.21/@body.1/@body.3/@body.1/@body.7/@argument.0/@source">

-      <details key="start" value="6328"/>

-      <details key="end" value="6331"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.215" references="/0/htmlReport/@body.1/@body.21/@body.1/@body.3/@body.1/@body.7/@argument.0/@argument.0">

-      <details key="start" value="6334"/>

-      <details key="end" value="6368"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.216" references="/0/htmlReport/@body.1/@body.21/@body.1/@body.3/@body.1/@body.7/@argument.0/@argument.0/projectDiscovery">

-      <details key="start" value="6334"/>

-      <details key="end" value="6350"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.217" references="/0/htmlReport/@body.1/@body.21/@body.1/@body.3/@body.1/@body.8">

-      <details key="start" value="6371"/>

-      <details key="end" value="6387"/>

-      <details key="line" value="178"/>

-    </eAnnotations>

-    <eAnnotations source="positions.218" references="/0/htmlReport/@body.1/@body.21/@body.1/@body.3/@body.1/projectDiscovery">

-      <details key="start" value="6063"/>

-      <details key="end" value="6098"/>

-      <details key="line" value="176"/>

-    </eAnnotations>

-    <eAnnotations source="positions.219" references="/0/htmlReport/@body.1/@body.21/@body.1/@body.3/@body.1/@iterSet">

-      <details key="start" value="6101"/>

-      <details key="end" value="6130"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.220" references="/0/htmlReport/@body.1/@body.21/@body.1/@body.3/@body.1/@iterSet/averagedDiscovery">

-      <details key="start" value="6101"/>

-      <details key="end" value="6118"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.221" references="/0/htmlReport/@body.1/@body.21/@body.1/@body.3/@body.2">

-      <details key="start" value="6394"/>

-      <details key="end" value="6404"/>

-      <details key="line" value="181"/>

-    </eAnnotations>

-    <eAnnotations source="positions.222" references="/0/htmlReport/@body.1/@body.21/@body.1/@body.3/maxSaveTime">

-      <details key="start" value="5843"/>

-      <details key="end" value="5906"/>

-      <details key="line" value="169"/>

-    </eAnnotations>

-    <eAnnotations source="positions.223" references="/0/htmlReport/@body.1/@body.21/@body.1/@body.3/maxSaveTime/@initExpression">

-      <details key="start" value="5865"/>

-      <details key="end" value="5907"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.224" references="/0/htmlReport/@body.1/@body.21/@body.1/@body.3/maxSaveTime/@initExpression/@argument.0">

-      <details key="start" value="5877"/>

-      <details key="end" value="5906"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.225" references="/0/htmlReport/@body.1/@body.21/@body.1/@body.3/maxSaveTime/@initExpression/@argument.0/averagedDiscovery">

-      <details key="start" value="5877"/>

-      <details key="end" value="5894"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.226" references="/0/htmlReport/@body.1/@body.21/@body.1/averagedDiscovery">

-      <details key="start" value="5718"/>

-      <details key="end" value="5762"/>

-      <details key="line" value="167"/>

-    </eAnnotations>

-    <eAnnotations source="positions.227" references="/0/htmlReport/@body.1/@body.21/@body.1/@iterSet">

-      <details key="start" value="5765"/>

-      <details key="end" value="5778"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.228" references="/0/htmlReport/@body.1/@body.21/@body.1/@iterSet/b">

-      <details key="start" value="5765"/>

-      <details key="end" value="5766"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.229" references="/0/htmlReport/@body.1/@body.21/@ifExpr">

-      <details key="start" value="5627"/>

-      <details key="end" value="5675"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.230" references="/0/htmlReport/@body.1/@body.21/@ifExpr/@source">

-      <details key="start" value="5628"/>

-      <details key="end" value="5670"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.231" references="/0/htmlReport/@body.1/@body.21/@ifExpr/@source/@source">

-      <details key="start" value="5628"/>

-      <details key="end" value="5662"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.232" references="/0/htmlReport/@body.1/@body.21/@ifExpr/@source/@source/@source">

-      <details key="start" value="5628"/>

-      <details key="end" value="5650"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.233" references="/0/htmlReport/@body.1/@body.21/@ifExpr/@source/@source/@source/@source">

-      <details key="start" value="5628"/>

-      <details key="end" value="5641"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.234" references="/0/htmlReport/@body.1/@body.21/@ifExpr/@source/@source/@source/@source/b">

-      <details key="start" value="5628"/>

-      <details key="end" value="5629"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.235" references="/0/htmlReport/@body.1/@body.21/@ifExpr/@argument.0">

-      <details key="start" value="5673"/>

-      <details key="end" value="5674"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.236" references="/0/htmlReport/@body.1/@body.22">

-      <details key="start" value="6424"/>

-      <details key="end" value="6451"/>

-      <details key="line" value="186"/>

-    </eAnnotations>

-    <eAnnotations source="positions.237" references="/0/htmlReport/@body.1/@body.23">

-      <details key="start" value="6451"/>

-      <details key="end" value="7623"/>

-      <details key="line" value="188"/>

-    </eAnnotations>

-    <eAnnotations source="positions.238" references="/0/htmlReport/@body.1/@body.23/@body.0">

-      <details key="start" value="6521"/>

-      <details key="end" value="6525"/>

-      <details key="line" value="189"/>

-    </eAnnotations>

-    <eAnnotations source="positions.239" references="/0/htmlReport/@body.1/@body.23/@body.1">

-      <details key="start" value="6526"/>

-      <details key="end" value="6569"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.240" references="/0/htmlReport/@body.1/@body.23/@body.1/@source">

-      <details key="start" value="6526"/>

-      <details key="end" value="6564"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.241" references="/0/htmlReport/@body.1/@body.23/@body.1/@source/@source">

-      <details key="start" value="6526"/>

-      <details key="end" value="6555"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.242" references="/0/htmlReport/@body.1/@body.23/@body.1/@source/@source/averagedDiscovery">

-      <details key="start" value="6526"/>

-      <details key="end" value="6543"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.243" references="/0/htmlReport/@body.1/@body.23/@body.2">

-      <details key="start" value="6571"/>

-      <details key="end" value="6577"/>

-      <details key="line" value="189"/>

-    </eAnnotations>

-    <eAnnotations source="positions.244" references="/0/htmlReport/@body.1/@body.23/@body.3">

-      <details key="start" value="6577"/>

-      <details key="end" value="7616"/>

-      <details key="line" value="190"/>

-    </eAnnotations>

-    <eAnnotations source="positions.245" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.0">

-      <details key="start" value="6673"/>

-      <details key="end" value="6687"/>

-      <details key="line" value="191"/>

-    </eAnnotations>

-    <eAnnotations source="positions.246" references="/0/htmlReport/@body.1/@body.23/@body.3/i">

-      <details key="start" value="6688"/>

-      <details key="end" value="6689"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.247" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.2">

-      <details key="start" value="6691"/>

-      <details key="end" value="6710"/>

-      <details key="line" value="191"/>

-    </eAnnotations>

-    <eAnnotations source="positions.248" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.3">

-      <details key="start" value="6711"/>

-      <details key="end" value="6732"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.249" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.3/projectDiscovery">

-      <details key="start" value="6711"/>

-      <details key="end" value="6727"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.250" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.4">

-      <details key="start" value="6734"/>

-      <details key="end" value="6753"/>

-      <details key="line" value="192"/>

-    </eAnnotations>

-    <eAnnotations source="positions.251" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.5">

-      <details key="start" value="6754"/>

-      <details key="end" value="6783"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.252" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.5/projectDiscovery">

-      <details key="start" value="6754"/>

-      <details key="end" value="6770"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.253" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.6">

-      <details key="start" value="6785"/>

-      <details key="end" value="6809"/>

-      <details key="line" value="193"/>

-    </eAnnotations>

-    <eAnnotations source="positions.254" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.7">

-      <details key="start" value="6810"/>

-      <details key="end" value="6843"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.255" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.7/projectDiscovery">

-      <details key="start" value="6810"/>

-      <details key="end" value="6826"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.256" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.8">

-      <details key="start" value="6845"/>

-      <details key="end" value="6870"/>

-      <details key="line" value="194"/>

-    </eAnnotations>

-    <eAnnotations source="positions.257" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.9">

-      <details key="start" value="6871"/>

-      <details key="end" value="6900"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.258" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.9/projectDiscovery">

-      <details key="start" value="6871"/>

-      <details key="end" value="6887"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.259" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.10">

-      <details key="start" value="6902"/>

-      <details key="end" value="6904"/>

-      <details key="line" value="195"/>

-    </eAnnotations>

-    <eAnnotations source="positions.260" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.11">

-      <details key="start" value="6905"/>

-      <details key="end" value="6941"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.261" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.11/projectDiscovery">

-      <details key="start" value="6905"/>

-      <details key="end" value="6921"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.262" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.12">

-      <details key="start" value="6943"/>

-      <details key="end" value="6968"/>

-      <details key="line" value="195"/>

-    </eAnnotations>

-    <eAnnotations source="positions.263" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.13">

-      <details key="start" value="6969"/>

-      <details key="end" value="7023"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.264" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.13/@argument.0">

-      <details key="start" value="6982"/>

-      <details key="end" value="7022"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.265" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.13/@argument.0/@source">

-      <details key="start" value="6982"/>

-      <details key="end" value="6985"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.266" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.13/@argument.0/@argument.0">

-      <details key="start" value="6988"/>

-      <details key="end" value="7022"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.267" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.13/@argument.0/@argument.0/projectDiscovery">

-      <details key="start" value="6988"/>

-      <details key="end" value="7004"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.268" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.14">

-      <details key="start" value="7025"/>

-      <details key="end" value="7054"/>

-      <details key="line" value="196"/>

-    </eAnnotations>

-    <eAnnotations source="positions.269" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.15">

-      <details key="start" value="7055"/>

-      <details key="end" value="7119"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.270" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.15/@argument.0">

-      <details key="start" value="7068"/>

-      <details key="end" value="7118"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.271" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.15/@argument.0/@source">

-      <details key="start" value="7068"/>

-      <details key="end" value="7071"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.272" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.15/@argument.0/@argument.0">

-      <details key="start" value="7074"/>

-      <details key="end" value="7118"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.273" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.15/@argument.0/@argument.0/projectDiscovery">

-      <details key="start" value="7074"/>

-      <details key="end" value="7090"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.274" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.16">

-      <details key="start" value="7121"/>

-      <details key="end" value="7153"/>

-      <details key="line" value="197"/>

-    </eAnnotations>

-    <eAnnotations source="positions.275" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.17">

-      <details key="start" value="7154"/>

-      <details key="end" value="7187"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.276" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.17/projectDiscovery">

-      <details key="start" value="7154"/>

-      <details key="end" value="7170"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.277" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.18">

-      <details key="start" value="7189"/>

-      <details key="end" value="7219"/>

-      <details key="line" value="198"/>

-    </eAnnotations>

-    <eAnnotations source="positions.278" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.19">

-      <details key="start" value="7220"/>

-      <details key="end" value="7277"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.279" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.19/@argument.0">

-      <details key="start" value="7233"/>

-      <details key="end" value="7276"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.280" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.19/@argument.0/@source">

-      <details key="start" value="7233"/>

-      <details key="end" value="7236"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.281" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.19/@argument.0/@argument.0">

-      <details key="start" value="7239"/>

-      <details key="end" value="7276"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.282" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.19/@argument.0/@argument.0/projectDiscovery">

-      <details key="start" value="7239"/>

-      <details key="end" value="7255"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.283" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.20">

-      <details key="start" value="7279"/>

-      <details key="end" value="7318"/>

-      <details key="line" value="199"/>

-    </eAnnotations>

-    <eAnnotations source="positions.284" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.21">

-      <details key="start" value="7319"/>

-      <details key="end" value="7357"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.285" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.21/projectDiscovery">

-      <details key="start" value="7319"/>

-      <details key="end" value="7335"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.286" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.22">

-      <details key="start" value="7359"/>

-      <details key="end" value="7387"/>

-      <details key="line" value="200"/>

-    </eAnnotations>

-    <eAnnotations source="positions.287" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.23">

-      <details key="start" value="7388"/>

-      <details key="end" value="7439"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.288" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.23/@argument.0">

-      <details key="start" value="7401"/>

-      <details key="end" value="7438"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.289" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.23/@argument.0/@source">

-      <details key="start" value="7401"/>

-      <details key="end" value="7404"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.290" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.23/@argument.0/@argument.0">

-      <details key="start" value="7407"/>

-      <details key="end" value="7438"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.291" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.23/@argument.0/@argument.0/projectDiscovery">

-      <details key="start" value="7407"/>

-      <details key="end" value="7423"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.292" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.24">

-      <details key="start" value="7441"/>

-      <details key="end" value="7447"/>

-      <details key="line" value="201"/>

-    </eAnnotations>

-    <eAnnotations source="positions.293" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.25">

-      <details key="start" value="7447"/>

-      <details key="end" value="7609"/>

-      <details key="line" value="202"/>

-    </eAnnotations>

-    <eAnnotations source="positions.294" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.25/@body.0">

-      <details key="start" value="7507"/>

-      <details key="end" value="7554"/>

-      <details key="line" value="203"/>

-    </eAnnotations>

-    <eAnnotations source="positions.295" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.25/@body.1">

-      <details key="start" value="7555"/>

-      <details key="end" value="7594"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.296" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.25/@body.1/@argument.0">

-      <details key="start" value="7562"/>

-      <details key="end" value="7593"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.297" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.25/@body.1/@argument.0/projectDiscovery">

-      <details key="start" value="7562"/>

-      <details key="end" value="7578"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.298" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.25/@body.2">

-      <details key="start" value="7596"/>

-      <details key="end" value="7604"/>

-      <details key="line" value="204"/>

-    </eAnnotations>

-    <eAnnotations source="positions.299" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.25/@ifExpr">

-      <details key="start" value="7451"/>

-      <details key="end" value="7505"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.300" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.25/@ifExpr/@source">

-      <details key="start" value="7456"/>

-      <details key="end" value="7504"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.301" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.25/@ifExpr/@source/@source">

-      <details key="start" value="7456"/>

-      <details key="end" value="7487"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.302" references="/0/htmlReport/@body.1/@body.23/@body.3/@body.25/@ifExpr/@source/@source/projectDiscovery">

-      <details key="start" value="7456"/>

-      <details key="end" value="7472"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.303" references="/0/htmlReport/@body.1/@body.23/@body.3/projectDiscovery">

-      <details key="start" value="6583"/>

-      <details key="end" value="6618"/>

-      <details key="line" value="190"/>

-    </eAnnotations>

-    <eAnnotations source="positions.304" references="/0/htmlReport/@body.1/@body.23/@body.3/@iterSet">

-      <details key="start" value="6621"/>

-      <details key="end" value="6650"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.305" references="/0/htmlReport/@body.1/@body.23/@body.3/@iterSet/averagedDiscovery">

-      <details key="start" value="6621"/>

-      <details key="end" value="6638"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.306" references="/0/htmlReport/@body.1/@body.23/@body.3/@each">

-      <details key="start" value="6663"/>

-      <details key="end" value="6670"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.307" references="/0/htmlReport/@body.1/@body.23/averagedDiscovery">

-      <details key="start" value="6457"/>

-      <details key="end" value="6501"/>

-      <details key="line" value="188"/>

-    </eAnnotations>

-    <eAnnotations source="positions.308" references="/0/htmlReport/@body.1/@body.23/@iterSet">

-      <details key="start" value="6504"/>

-      <details key="end" value="6517"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.309" references="/0/htmlReport/@body.1/@body.23/@iterSet/b">

-      <details key="start" value="6504"/>

-      <details key="end" value="6505"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.310" references="/0/htmlReport/@body.1/@body.24">

-      <details key="start" value="7624"/>

-      <details key="end" value="7798"/>

-      <details key="line" value="208"/>

-    </eAnnotations>

-    <eAnnotations source="positions.311" references="/0/htmlReport/@body.1/targetFileName">

-      <details key="start" value="1725"/>

-      <details key="end" value="1739"/>

-      <details key="line" value="0"/>

-    </eAnnotations>

-    <eAnnotations source="positions.312" references="/0/htmlReport/b">

-      <details key="start" value="1636"/>

-      <details key="end" value="1671"/>

-      <details key="line" value="21"/>

-    </eAnnotations>

-    <eAnnotations source="positions.313" references="/0/htmlReport/targetFileName">

-      <details key="start" value="1673"/>

-      <details key="end" value="1696"/>

-      <details key="line" value="21"/>

-    </eAnnotations>

-  </ecore:EAnnotation>

-</xmi:XMI>

diff --git a/org.eclipse.modisco.java.discoverer.benchmark/emtlCopy.build.xml b/org.eclipse.modisco.java.discoverer.benchmark/emtlCopy.build.xml
deleted file mode 100644
index 5c307e6..0000000
--- a/org.eclipse.modisco.java.discoverer.benchmark/emtlCopy.build.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--

-Copyright (c) 2009 Mia-Software.

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

-    Gregoire DUPE (Mia-Software)

-    Nicolas Bros (Mia-Software)

--->

-

-<project name="emtlCopy" default="emtlCopy">

-	<property name="htmlReport.emtl.dir" value="org/eclipse/modisco/java/discoverer/benchmark/template/html"></property>

-	<property name="htmlReport.emtl" value="${htmlReport.emtl.dir}/htmlReport.emtl"></property>

-	<property name="htmlReport2.emtl" value="${htmlReport.emtl.dir}/htmlReport2.emtl"></property>

-	<target name="emtlCopy">

-		<copy file="${basedir}/bin/${htmlReport.emtl}" tofile="${basedir}/emtl/${htmlReport.emtl}"/>

-		<copy file="${basedir}/bin/${htmlReport2.emtl}" tofile="${basedir}/emtl/${htmlReport2.emtl}"/>

-	</target>

-	<target name="emtlCopyBack">

-		<copy file="emtl/${htmlReport.emtl}" tofile="bin/${htmlReport.emtl}"/>

-		<copy file="emtl/${htmlReport2.emtl}" tofile="bin/${htmlReport2.emtl}"/>

-	</target>

-</project>

diff --git a/org.eclipse.modisco.java.discoverer.benchmark/pom.xsl b/org.eclipse.modisco.java.discoverer.benchmark/pom.xsl
new file mode 100644
index 0000000..942d20d
--- /dev/null
+++ b/org.eclipse.modisco.java.discoverer.benchmark/pom.xsl
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!-- 

+Copyright (c) 2012, 2015 Mia-Software.

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

+    Grégoire Dupé (Mia-Software) - Bug 413749 - Missing GenerateJava.emtl file in modisco java generator plugin

+    Grégoire Dupé (Mia-Software) - Bug 468620 - [Unit Test Failure] org.eclipse.modisco.java.discoverer.benchmark.tests.JavaDiscovererBenchmarkTest.test001

+-->

+<xsl:stylesheet version="1.0"

+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common"

+	extension-element-prefixes="exsl" xmlns:m2="http://maven.apache.org/POM/4.0.0"

+	xmlns="http://maven.apache.org/POM/4.0.0">

+	<xsl:output indent="yes" />

+

+	<xsl:template match="/">

+		

+		<project

+			xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"

+			xmlns="http://maven.apache.org/POM/4.0.0"

+			xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

+			<xsl:apply-templates select="//m2:project/*[name()!='build']" />

+			<properties>

+				<eclipse-site>http://download.eclipse.org/releases/indigo</eclipse-site>

+				<platform-version>[3.7,3.8)</platform-version>

+			</properties>

+			<repositories>

+				<repository>

+					<id>Eclipse - Acceleo Snapshots</id>

+					<url>https://repo.eclipse.org/content/repositories/acceleo-snapshots</url>

+				</repository>

+				<repository>

+					<id>Eclipse - Acceleo Release</id>

+					<url>https://repo.eclipse.org/content/repositories/acceleo-releases</url>

+				</repository>

+			</repositories>

+		

+			<pluginRepositories>

+				<pluginRepository>

+					<id>Eclipse - Acceleo Snapshots</id>

+					<url>https://repo.eclipse.org/content/repositories/acceleo-snapshots</url>

+				</pluginRepository>

+				<pluginRepository>

+					<id>Eclipse - Acceleo Release</id>

+					<url>https://repo.eclipse.org/content/repositories/acceleo-releases</url>

+				</pluginRepository>

+			</pluginRepositories>

+

+			<dependencies>

+				<dependency>

+					<groupId>org.eclipse.acceleo</groupId>

+					<artifactId>org.eclipse.acceleo.maven</artifactId>

+					<version>3.5.0-SNAPSHOT</version>

+				</dependency>

+				<dependency>

+					<groupId>org.eclipse.acceleo</groupId>

+					<artifactId>org.eclipse.acceleo.engine</artifactId>

+					<version>3.5.0-SNAPSHOT</version>

+				</dependency>

+				<dependency>

+					<groupId>org.slf4j</groupId>

+					<artifactId>slf4j-simple</artifactId>

+					<version>1.6.4</version>

+				</dependency>

+			</dependencies>

+			

+			<build>

+				<plugins>

+					<xsl:copy-of select="//m2:project/build/plugins/*"/>

+					<plugin>

+						<groupId>org.eclipse.acceleo</groupId>

+						<artifactId>org.eclipse.acceleo.maven</artifactId>

+						<version>3.5.0-SNAPSHOT</version>

+						<executions>

+							<execution>

+								<goals>

+									<goal>acceleo-compile</goal>

+								</goals>

+								<phase>compile</phase>

+							</execution>

+						</executions>

+						<configuration>

+							<useBinaryResources>false</useBinaryResources>

+							<usePlatformResourcePath>true</usePlatformResourcePath>

+							<acceleoProject>

+								<root>${basedir}</root>

+								<entries>

+									<entry>

+										<input>src/</input>

+										<output>__target__/classes</output>

+									</entry>

+								</entries>

+								<jars>

+									<jar>p2.eclipse-plugin:org.eclipse.emf.ecore</jar>

+									<jar>org.eclipse.mdt:org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark</jar>

+									<jar>org.eclipse.mdt:org.eclipse.modisco.infra.discovery.benchmark</jar>

+								</jars>

+							</acceleoProject>

+							<packagesToRegister>

+								<packageToRegister>org.eclipse.emf.ecore.EcorePackage</packageToRegister>

+								<packageToRegister>org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark.JavaBenchmarkPackage</packageToRegister>

+								<packageToRegister>org.eclipse.modisco.infra.discovery.benchmark.BenchmarkPackage</packageToRegister>

+							</packagesToRegister>

+							<uriHandler>org.eclipse.acceleo.maven.AcceleoURIHandler</uriHandler>

+						</configuration>

+					</plugin>

+					<plugin>

+						<groupId>org.apache.maven.plugins</groupId>

+						<artifactId>maven-resources-plugin</artifactId>

+						<version>2.4.1</version>

+						<configuration>

+							<encoding>UTF-8</encoding>

+						</configuration>

+					</plugin>

+				</plugins>

+				<xsl:copy-of select="//m2:project/build/*[name()!='plugins']"/>

+			</build>

+		</project>

+	</xsl:template>

+

+	<xsl:template match="m2:*|@*">

+		<xsl:copy-of select="." />

+	</xsl:template>

+

+</xsl:stylesheet>

diff --git a/org.eclipse.modisco.java.discoverer.cdo.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.java.discoverer.cdo.tests/META-INF/MANIFEST.MF
index a88a088..1c72b46 100644
--- a/org.eclipse.modisco.java.discoverer.cdo.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.java.discoverer.cdo.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.java.discoverer.cdo.tests;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.java.discoverer.cdo.tests.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui;bundle-version="3.5.0",
diff --git a/org.eclipse.modisco.java.discoverer.cdo.tests/src/org/eclipse/modisco/java/discoverer/cdo/tests/AllTestsInUIThread.java b/org.eclipse.modisco.java.discoverer.cdo.tests/src/org/eclipse/modisco/java/discoverer/cdo/tests/AllTestsInUIThread.java
index 44ca023..bf2b475 100644
--- a/org.eclipse.modisco.java.discoverer.cdo.tests/src/org/eclipse/modisco/java/discoverer/cdo/tests/AllTestsInUIThread.java
+++ b/org.eclipse.modisco.java.discoverer.cdo.tests/src/org/eclipse/modisco/java/discoverer/cdo/tests/AllTestsInUIThread.java
@@ -17,7 +17,7 @@
 

 @RunWith(Suite.class)

 @SuiteClasses({ 

-//	JavaJunitCDO.class 

+	JavaJunitCDO.class 

 	})

 public class AllTestsInUIThread {

 	// JUnit 4 test suite

diff --git a/org.eclipse.modisco.java.discoverer.cdo.tests/src/org/eclipse/modisco/java/discoverer/cdo/tests/JavaJunitCDO.java b/org.eclipse.modisco.java.discoverer.cdo.tests/src/org/eclipse/modisco/java/discoverer/cdo/tests/JavaJunitCDO.java
index c4be536..94013b2 100644
--- a/org.eclipse.modisco.java.discoverer.cdo.tests/src/org/eclipse/modisco/java/discoverer/cdo/tests/JavaJunitCDO.java
+++ b/org.eclipse.modisco.java.discoverer.cdo.tests/src/org/eclipse/modisco/java/discoverer/cdo/tests/JavaJunitCDO.java
@@ -21,7 +21,9 @@
 import org.eclipse.modisco.java.discoverer.cdo.JavaDiscovererCDO;

 import org.eclipse.modisco.java.discoverer.tests.JavaJUnitEMF;

 import org.junit.AfterClass;

+import org.junit.Ignore;

 

+@Ignore //cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=399504

 public class JavaJunitCDO extends JavaJUnitEMF {

 

 	private final int port = 2036;

diff --git a/org.eclipse.modisco.java.discoverer.cdo/META-INF/MANIFEST.MF b/org.eclipse.modisco.java.discoverer.cdo/META-INF/MANIFEST.MF
index aad1cb5..a17d45c 100644
--- a/org.eclipse.modisco.java.discoverer.cdo/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.java.discoverer.cdo/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.java.discoverer.cdo
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.java.discoverer.cdo.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui;bundle-version="3.5.0",
diff --git a/org.eclipse.modisco.java.discoverer.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.java.discoverer.tests/META-INF/MANIFEST.MF
index ab5bdc0..e34c1b2 100644
--- a/org.eclipse.modisco.java.discoverer.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.java.discoverer.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %Bundle-Name

 Bundle-SymbolicName: org.eclipse.modisco.java.discoverer.tests;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-Activator: org.eclipse.modisco.java.discoverer.tests.Activator

 Bundle-Vendor: %Bundle-Vendor

 Require-Bundle: org.eclipse.ui;bundle-version="3.5.0",

diff --git a/org.eclipse.modisco.java.discoverer.tests/src/org/eclipse/modisco/java/discoverer/tests/AllTestsInUIThread.java b/org.eclipse.modisco.java.discoverer.tests/src/org/eclipse/modisco/java/discoverer/tests/AllTestsInUIThread.java
index 5838976..eeb2f0b 100644
--- a/org.eclipse.modisco.java.discoverer.tests/src/org/eclipse/modisco/java/discoverer/tests/AllTestsInUIThread.java
+++ b/org.eclipse.modisco.java.discoverer.tests/src/org/eclipse/modisco/java/discoverer/tests/AllTestsInUIThread.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2010, 2012 Mia-Software.

+ * Copyright (c) 2010, 2015 Mia-Software.

  * 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

@@ -9,6 +9,7 @@
  *		Nicolas Bros (Mia-Software)

  *		Nicolas Bros (Mia-Software) - Bug 335003 - [Discoverer] : Existing Discoverers Refactoring based on new framework

  *		Gregoire Dupe (Mia-Software) - Bug 386235 - [Releng] Use tycho to build MoDisco

+ *		Fabien Giquel (Mia-Software) - Bug 351590 - [Java] ClassCastException while discovering Apache math commons

  *******************************************************************************/

 package org.eclipse.modisco.java.discoverer.tests;

 

@@ -20,7 +21,7 @@
 @SuiteClasses({ Bug329423CommentsTest.class, Java2KdmConverterTest.class,

 		JavaJUnitEMF.class, JavaProject2KdmTest.class,

 		ParameterizedDiscovery.class, SimpleBlackBoxConverter.class,

-		SimpleBlackBoxDiscovery.class })

+		SimpleBlackBoxDiscovery.class, Bug351590ClassCastWithAnnotationMemberTest.class })

 public class AllTestsInUIThread {

 	// JUnit 4 test suite

 }

diff --git a/org.eclipse.modisco.java.discoverer.tests/src/org/eclipse/modisco/java/discoverer/tests/Bug351590ClassCastWithAnnotationMemberTest.java b/org.eclipse.modisco.java.discoverer.tests/src/org/eclipse/modisco/java/discoverer/tests/Bug351590ClassCastWithAnnotationMemberTest.java
new file mode 100644
index 0000000..7f599d1
--- /dev/null
+++ b/org.eclipse.modisco.java.discoverer.tests/src/org/eclipse/modisco/java/discoverer/tests/Bug351590ClassCastWithAnnotationMemberTest.java
@@ -0,0 +1,61 @@
+/*******************************************************************************

+ * Copyright (c) 2015 Mia-Software.

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

+ *		Fabien Giquel (Mia-Software) - Bug 351590 - [Java] ClassCastException while discovering Apache math commons

+ *******************************************************************************/

+

+package org.eclipse.modisco.java.discoverer.tests;

+

+import org.eclipse.gmt.modisco.java.AbstractMethodDeclaration;

+import org.eclipse.gmt.modisco.java.Expression;

+import org.eclipse.gmt.modisco.java.MethodDeclaration;

+import org.eclipse.gmt.modisco.java.MethodInvocation;

+import org.eclipse.gmt.modisco.java.Statement;

+import org.eclipse.gmt.modisco.java.VariableDeclarationStatement;

+import org.eclipse.gmt.modisco.java.internal.util.JavaUtil;

+import org.eclipse.modisco.java.discoverer.tests.utils.AbstractDiscoverTest;

+import org.junit.Assert;

+import org.junit.Test;

+

+public class Bug351590ClassCastWithAnnotationMemberTest extends AbstractDiscoverTest {

+

+	@Override

+	protected String getTargetProjectName() {

+		return Activator.PLUGIN_ID + "_bug351590"; //$NON-NLS-1$

+	}

+

+	@Override

+	protected String getSourcesReferencePath() {

+		return "/workspace/bug351590/"; //$NON-NLS-1$

+	}

+

+	@Test

+	// Bugzilla 351590 : metamodel evolution needed, a MethodInvocation cannot reference one AnnotationTypeMemberDeclaration

+	// Temporary workaround for not getting Status error : affect unresolvedMethod with name matching the AnnotationTypeMemberDeclaration

+	public void testMethodInvocationToAnnotationMember() {

+		MethodDeclaration aMethod = (MethodDeclaration) JavaUtil

+				.getNamedElementByQualifiedName(getModel(),

+						"(default package).MyClass.m()"); //$NON-NLS-1$

+		Assert.assertNotNull(aMethod);

+

+		// look for "String f1 = anAnnot.arg1();"

+		Statement statement = aMethod.getBody().getStatements().get(1);

+		Assert.assertNotNull(statement);

+		Assert.assertTrue(statement instanceof VariableDeclarationStatement);

+		

+		Expression initializer = ((VariableDeclarationStatement) statement).getFragments().get(0).getInitializer();

+		Assert.assertNotNull(initializer);

+		Assert.assertTrue(initializer instanceof MethodInvocation);

+		

+		// Here, the fix has create some unresolvedMethod with a name indicating the true AnnotationTypeMemberDeclaration

+		AbstractMethodDeclaration method = ((MethodInvocation) initializer).getMethod();

+		Assert.assertNotNull(method);

+		Assert.assertTrue(method.getName().contains("arg1"));

+	}

+

+}

diff --git a/org.eclipse.modisco.java.discoverer.tests/workspace/bug351590/.classpath b/org.eclipse.modisco.java.discoverer.tests/workspace/bug351590/.classpath
new file mode 100644
index 0000000..2415132
--- /dev/null
+++ b/org.eclipse.modisco.java.discoverer.tests/workspace/bug351590/.classpath
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!-- 

+ * Copyright (c) 2015 Mia-Software.

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

+ *		Fabien Giquel (Mia-Software) - Bug 351590 - [Java] ClassCastException while discovering Apache math commons

+ -->

+<classpath>

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

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

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

+</classpath>

diff --git a/org.eclipse.modisco.java.discoverer.tests/workspace/bug351590/.project b/org.eclipse.modisco.java.discoverer.tests/workspace/bug351590/.project
new file mode 100644
index 0000000..5db41af
--- /dev/null
+++ b/org.eclipse.modisco.java.discoverer.tests/workspace/bug351590/.project
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!-- 

+ * Copyright (c) 2015 Mia-Software.

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

+ *		Fabien Giquel (Mia-Software) - Bug 351590 - [Java] ClassCastException while discovering Apache math commons

+ -->

+<projectDescription>

+	<name>bug351590</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

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

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

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

+	</natures>

+</projectDescription>

diff --git a/org.eclipse.modisco.java.discoverer.tests/workspace/bug351590/src/MyClass.java b/org.eclipse.modisco.java.discoverer.tests/workspace/bug351590/src/MyClass.java
new file mode 100644
index 0000000..5f53a20
--- /dev/null
+++ b/org.eclipse.modisco.java.discoverer.tests/workspace/bug351590/src/MyClass.java
@@ -0,0 +1,19 @@
+/*******************************************************************************

+ * Copyright (c) 2015 Mia-Software.

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

+ *		Fabien Giquel (Mia-Software) - Bug 351590 - [Java] ClassCastException while discovering Apache math commons

+ *******************************************************************************/

+

+public class MyClass {

+

+	public void m() {

+		mypkg.MyAnnotation anAnnot = null;

+		String f1 = anAnnot.arg1();

+	}

+

+}

diff --git a/org.eclipse.modisco.java.discoverer.tests/workspace/bug351590/src/mypkg/MyAnnotation.java b/org.eclipse.modisco.java.discoverer.tests/workspace/bug351590/src/mypkg/MyAnnotation.java
new file mode 100644
index 0000000..eba2660
--- /dev/null
+++ b/org.eclipse.modisco.java.discoverer.tests/workspace/bug351590/src/mypkg/MyAnnotation.java
@@ -0,0 +1,24 @@
+/*******************************************************************************

+ * Copyright (c) 2015 Mia-Software.

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

+ *		Fabien Giquel (Mia-Software) - Bug 351590 - [Java] ClassCastException while discovering Apache math commons

+ *******************************************************************************/

+package mypkg;

+

+public @interface MyAnnotation {

+

+	public class myClass {

+		public void m() {

+			MyAnnotation anAnnot = null;

+			String f1 = anAnnot.arg1();

+		}

+	}

+

+	String arg1();

+

+}

diff --git a/org.eclipse.modisco.java.discoverer.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.java.discoverer.ui/META-INF/MANIFEST.MF
index 5bfe70f..eac55da 100644
--- a/org.eclipse.modisco.java.discoverer.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.java.discoverer.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.java.discoverer.ui;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.java.discoverer.ui.internal.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
@@ -11,7 +11,6 @@
  org.eclipse.emf.facet.common.core;bundle-version="0.1.0",
  org.eclipse.emf.facet.widgets;bundle-version="0.1.0",
  org.eclipse.emf.facet.widgets.celleditors;bundle-version="0.1.0",
- org.eclipse.emf.facet.infra.common.core;bundle-version="0.1.0",
  org.eclipse.modisco.java.discoverer;bundle-version="0.9.0",
  org.eclipse.jdt.core;bundle-version="3.6.0",
  org.eclipse.jdt.ui;bundle-version="3.6.0",
diff --git a/org.eclipse.modisco.java.discoverer/META-INF/MANIFEST.MF b/org.eclipse.modisco.java.discoverer/META-INF/MANIFEST.MF
index a877264..cf3dcb4 100644
--- a/org.eclipse.modisco.java.discoverer/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.java.discoverer/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-ActivationPolicy: lazy

 Bundle-Vendor: %Bundle-Vendor

 Bundle-SymbolicName: org.eclipse.modisco.java.discoverer;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

 Require-Bundle: org.eclipse.gmt.modisco.infra.common.core,

diff --git a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/PendingElement.java b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/PendingElement.java
index 786fb38..0e5c209 100644
--- a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/PendingElement.java
+++ b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/PendingElement.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2009 Mia-Software.

+ * Copyright (c) 2009, 2015 Mia-Software.

  * 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

@@ -12,6 +12,7 @@
  *    Gabriel Barbier (Mia-Software) - initial API and implementation

  *    Erwan Breton (Sodifrance) - initial API and implementation

  *    Romain Dervaux (Mia-Software) - initial API and implementation

+ *    Fabien Giquel (Mia-Software) - Bug 351590 - [Java] ClassCastException while discovering Apache math commons

  *******************************************************************************/

 package org.eclipse.modisco.java.discoverer.internal.io.java.binding;

 

@@ -31,17 +32,20 @@
 import org.eclipse.gmt.modisco.java.ASTNode;

 import org.eclipse.gmt.modisco.java.AbstractMethodInvocation;

 import org.eclipse.gmt.modisco.java.AnnotationMemberValuePair;

+import org.eclipse.gmt.modisco.java.AnnotationTypeMemberDeclaration;

 import org.eclipse.gmt.modisco.java.BreakStatement;

 import org.eclipse.gmt.modisco.java.ClassFile;

 import org.eclipse.gmt.modisco.java.Comment;

 import org.eclipse.gmt.modisco.java.CompilationUnit;

 import org.eclipse.gmt.modisco.java.ContinueStatement;

+import org.eclipse.gmt.modisco.java.MethodInvocation;

 import org.eclipse.gmt.modisco.java.MethodRef;

 import org.eclipse.gmt.modisco.java.NamedElement;

 import org.eclipse.gmt.modisco.java.SingleVariableAccess;

 import org.eclipse.gmt.modisco.java.TypeAccess;

 import org.eclipse.gmt.modisco.java.UnresolvedItem;

 import org.eclipse.gmt.modisco.java.emf.JavaFactory;

+import org.eclipse.gmt.modisco.java.internal.util.JavaUtil;

 import org.eclipse.modisco.java.discoverer.internal.JavaActivator;

 

 /**

@@ -162,10 +166,31 @@
 	public void affectTarget(final ASTNode target) {

 

 		if (this.clientNode != null) {

-			EStructuralFeature feature = this.clientNode.eClass().getEStructuralFeature(

+			final EStructuralFeature feature = this.clientNode.eClass().getEStructuralFeature(

 					this.linkName);

 

-			affectTarget0(feature, target);

+			if (target instanceof AnnotationTypeMemberDeclaration && this.clientNode instanceof MethodInvocation) {

+				// Bug workaround process

+				affectTargetAnnotationTypeMember(target, feature);

+			} else {

+				// Normal process

+				affectTarget0(feature, target);

+			}

+		}

+	}

+

+	private void affectTargetAnnotationTypeMember(final ASTNode target,

+			final EStructuralFeature feature) {

+		// Bugzilla 351590 : metamodel evolution needed, a MethodInvocation cannot reference one AnnotationTypeMemberDeclaration

+		// Temporary workaround : affect unresolvedMethod with name matching the AnnotationTypeMemberDeclaration

+		if (target.getOriginalCompilationUnit() != null

+				&& target.getOriginalCompilationUnit().getPackage() != null

+				&& target.getOriginalCompilationUnit().getPackage().getModel() != null) { 

+			final NamedElement method = affectUnresolvedTarget();

+			target.getOriginalCompilationUnit().getPackage().getModel().getUnresolvedItems().add((UnresolvedItem) method);

+			method.setName(JavaUtil.getQualifiedName(target));

+			method.setProxy(true);

+			affectTarget0(feature, method);

 		}

 	}

 

diff --git a/org.eclipse.modisco.java.doc.archi/META-INF/MANIFEST.MF b/org.eclipse.modisco.java.doc.archi/META-INF/MANIFEST.MF
index af8f827..d797994 100644
--- a/org.eclipse.modisco.java.doc.archi/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.java.doc.archi/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %Bundle-Name

 Bundle-SymbolicName: org.eclipse.modisco.java.doc.archi;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-Vendor: %Bundle-Vendor

 Require-Bundle: org.eclipse.core.runtime

 Bundle-ActivationPolicy: lazy

diff --git a/org.eclipse.modisco.java.doc/META-INF/MANIFEST.MF b/org.eclipse.modisco.java.doc/META-INF/MANIFEST.MF
index da00bc6..33c4ed8 100644
--- a/org.eclipse.modisco.java.doc/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.java.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %Bundle-Name

 Bundle-SymbolicName: org.eclipse.modisco.java.doc;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-Vendor: %Bundle-Vendor

 Require-Bundle: org.eclipse.core.runtime

 Bundle-ActivationPolicy: lazy

diff --git a/org.eclipse.modisco.java.feature/feature.xml b/org.eclipse.modisco.java.feature/feature.xml
index e761def..eca1079 100644
--- a/org.eclipse.modisco.java.feature/feature.xml
+++ b/org.eclipse.modisco.java.feature/feature.xml
@@ -12,7 +12,7 @@
 <feature

       id="org.eclipse.modisco.java.feature"

       label="MoDisco Java Feature (Incubation)"

-      version="0.12.2.qualifier"

+      version="0.13.2.qualifier"

       provider-name="%providerName"

       plugin="org.eclipse.gmt.modisco.java"

       license-feature="org.eclipse.license"

diff --git a/org.eclipse.modisco.java.generation.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.java.generation.tests/META-INF/MANIFEST.MF
index c14c802..2257350 100644
--- a/org.eclipse.modisco.java.generation.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.java.generation.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.java.generation.tests
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.java.generation.tests.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.java.generation.tests/src/org/eclipse/modisco/java/generation/tests/Activator.java b/org.eclipse.modisco.java.generation.tests/src/org/eclipse/modisco/java/generation/tests/Activator.java
index bfb5fee..5f4d88f 100644
--- a/org.eclipse.modisco.java.generation.tests/src/org/eclipse/modisco/java/generation/tests/Activator.java
+++ b/org.eclipse.modisco.java.generation.tests/src/org/eclipse/modisco/java/generation/tests/Activator.java
@@ -15,7 +15,9 @@
 

 /**

  * The activator class controls the plug-in life cycle

+ * @deprecated Will become internal cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470609

  */

+@Deprecated

 public class Activator extends AbstractUIPlugin {

 

 	// The plug-in ID

diff --git a/org.eclipse.modisco.java.queries.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.java.queries.tests/META-INF/MANIFEST.MF
index 6e4dd42..a1cbeae 100644
--- a/org.eclipse.modisco.java.queries.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.java.queries.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.java.queries.tests;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.java.queries.tests.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.gmt.modisco.infra.common.core;bundle-version="0.8.0",
diff --git a/org.eclipse.modisco.java.queries.tests/src/org/eclipse/modisco/java/queries/tests/Activator.java b/org.eclipse.modisco.java.queries.tests/src/org/eclipse/modisco/java/queries/tests/Activator.java
index b61d773..3f987b9 100644
--- a/org.eclipse.modisco.java.queries.tests/src/org/eclipse/modisco/java/queries/tests/Activator.java
+++ b/org.eclipse.modisco.java.queries.tests/src/org/eclipse/modisco/java/queries/tests/Activator.java
@@ -15,7 +15,9 @@
 

 /**

  * The activator class controls the plug-in life cycle

+ * @deprecated Will become internal cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470609

  */

+@Deprecated

 public class Activator extends AbstractUIPlugin {

 

 	// The plug-in ID

diff --git a/org.eclipse.modisco.jee.doc.archi/META-INF/MANIFEST.MF b/org.eclipse.modisco.jee.doc.archi/META-INF/MANIFEST.MF
index 2f1bc16..6847cfe 100644
--- a/org.eclipse.modisco.jee.doc.archi/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.jee.doc.archi/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %Bundle-Name

 Bundle-SymbolicName: org.eclipse.modisco.jee.doc.archi;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-Vendor: %Bundle-Vendor

 Require-Bundle: org.eclipse.core.runtime

 Bundle-ActivationPolicy: lazy

diff --git a/org.eclipse.modisco.jee.doc/META-INF/MANIFEST.MF b/org.eclipse.modisco.jee.doc/META-INF/MANIFEST.MF
index 7780958..0be86c7 100644
--- a/org.eclipse.modisco.jee.doc/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.jee.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %Bundle-Name

 Bundle-SymbolicName: org.eclipse.modisco.jee.doc;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-Vendor: %Bundle-Vendor

 Require-Bundle: org.eclipse.core.runtime

 Bundle-ActivationPolicy: lazy

diff --git a/org.eclipse.modisco.jee.ejbjar.discoverer.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.jee.ejbjar.discoverer.tests/META-INF/MANIFEST.MF
index 05d2b6f..17f9c4b 100644
--- a/org.eclipse.modisco.jee.ejbjar.discoverer.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.jee.ejbjar.discoverer.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.jee.ejbjar.discoverer.tests;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.jee.ejbjar.discoverer.tests.JUnitPlugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.jee.ejbjar.discoverer.tests/src/org/eclipse/modisco/jee/ejbjar/discoverer/tests/compatibility/TestEjbJar11.java b/org.eclipse.modisco.jee.ejbjar.discoverer.tests/src/org/eclipse/modisco/jee/ejbjar/discoverer/tests/compatibility/TestEjbJar11.java
index e8b9c65..c33803a 100644
--- a/org.eclipse.modisco.jee.ejbjar.discoverer.tests/src/org/eclipse/modisco/jee/ejbjar/discoverer/tests/compatibility/TestEjbJar11.java
+++ b/org.eclipse.modisco.jee.ejbjar.discoverer.tests/src/org/eclipse/modisco/jee/ejbjar/discoverer/tests/compatibility/TestEjbJar11.java
@@ -37,6 +37,9 @@
 import org.junit.Before;

 import org.junit.Test;

 

+/**

+ * @deprecated cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=474891

+ */

 @Deprecated

 public class TestEjbJar11 {

 

diff --git a/org.eclipse.modisco.jee.ejbjar.discoverer.tests/src/org/eclipse/modisco/jee/ejbjar/discoverer/tests/compatibility/TestEjbJar20.java b/org.eclipse.modisco.jee.ejbjar.discoverer.tests/src/org/eclipse/modisco/jee/ejbjar/discoverer/tests/compatibility/TestEjbJar20.java
index c84fe60..52fa649 100644
--- a/org.eclipse.modisco.jee.ejbjar.discoverer.tests/src/org/eclipse/modisco/jee/ejbjar/discoverer/tests/compatibility/TestEjbJar20.java
+++ b/org.eclipse.modisco.jee.ejbjar.discoverer.tests/src/org/eclipse/modisco/jee/ejbjar/discoverer/tests/compatibility/TestEjbJar20.java
@@ -37,6 +37,9 @@
 import org.junit.Before;

 import org.junit.Test;

 

+/**

+ * @deprecated cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=474891

+ */

 @Deprecated

 public class TestEjbJar20 {

 

diff --git a/org.eclipse.modisco.jee.ejbjar.discoverer.tests/src/org/eclipse/modisco/jee/ejbjar/discoverer/tests/compatibility/TestEjbJar21.java b/org.eclipse.modisco.jee.ejbjar.discoverer.tests/src/org/eclipse/modisco/jee/ejbjar/discoverer/tests/compatibility/TestEjbJar21.java
index a1b59dc..58023fa 100644
--- a/org.eclipse.modisco.jee.ejbjar.discoverer.tests/src/org/eclipse/modisco/jee/ejbjar/discoverer/tests/compatibility/TestEjbJar21.java
+++ b/org.eclipse.modisco.jee.ejbjar.discoverer.tests/src/org/eclipse/modisco/jee/ejbjar/discoverer/tests/compatibility/TestEjbJar21.java
@@ -37,6 +37,9 @@
 import org.junit.Before;

 import org.junit.Test;

 

+/**

+ * @deprecated cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=474891

+ */

 @Deprecated

 public class TestEjbJar21 {

 

diff --git a/org.eclipse.modisco.jee.ejbjar.discoverer.tests/src/org/eclipse/modisco/jee/ejbjar/discoverer/tests/compatibility/TestEjbJar30.java b/org.eclipse.modisco.jee.ejbjar.discoverer.tests/src/org/eclipse/modisco/jee/ejbjar/discoverer/tests/compatibility/TestEjbJar30.java
index 68434c9..abafd4c 100644
--- a/org.eclipse.modisco.jee.ejbjar.discoverer.tests/src/org/eclipse/modisco/jee/ejbjar/discoverer/tests/compatibility/TestEjbJar30.java
+++ b/org.eclipse.modisco.jee.ejbjar.discoverer.tests/src/org/eclipse/modisco/jee/ejbjar/discoverer/tests/compatibility/TestEjbJar30.java
@@ -38,6 +38,9 @@
 import org.junit.Before;

 import org.junit.Test;

 

+/**

+ * @deprecated cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=474891

+ */

 @Deprecated

 public class TestEjbJar30 {

 

diff --git a/org.eclipse.modisco.jee.ejbjar.discoverer.tests/src/org/eclipse/modisco/jee/ejbjar/discoverer/tests/compatibility/TestEjbJar31.java b/org.eclipse.modisco.jee.ejbjar.discoverer.tests/src/org/eclipse/modisco/jee/ejbjar/discoverer/tests/compatibility/TestEjbJar31.java
index b09bd9e..d57a33f 100644
--- a/org.eclipse.modisco.jee.ejbjar.discoverer.tests/src/org/eclipse/modisco/jee/ejbjar/discoverer/tests/compatibility/TestEjbJar31.java
+++ b/org.eclipse.modisco.jee.ejbjar.discoverer.tests/src/org/eclipse/modisco/jee/ejbjar/discoverer/tests/compatibility/TestEjbJar31.java
@@ -38,6 +38,9 @@
 import org.junit.Before;

 import org.junit.Test;

 

+/**

+ * @deprecated cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=474891

+ */

 @Deprecated

 public class TestEjbJar31 {

 

diff --git a/org.eclipse.modisco.jee.ejbjar.discoverer.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.jee.ejbjar.discoverer.ui/META-INF/MANIFEST.MF
index 30cc9c1..f117a78 100644
--- a/org.eclipse.modisco.jee.ejbjar.discoverer.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.jee.ejbjar.discoverer.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.jee.ejbjar.discoverer.ui;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.jee.ejbjar.discoverer.ui.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.modisco.jee.ejbjar.discoverer/META-INF/MANIFEST.MF b/org.eclipse.modisco.jee.ejbjar.discoverer/META-INF/MANIFEST.MF
index 5a9a81b..ac4b773 100644
--- a/org.eclipse.modisco.jee.ejbjar.discoverer/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.jee.ejbjar.discoverer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.jee.ejbjar.discoverer;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.jee.ejbjar.discoverer.EjbJarActivator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.jee.ejbjar.discoverer/OSGI-INF/l10n/bundle.properties b/org.eclipse.modisco.jee.ejbjar.discoverer/OSGI-INF/l10n/bundle.properties
index 2344b9d..6043d92 100644
--- a/org.eclipse.modisco.jee.ejbjar.discoverer/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.modisco.jee.ejbjar.discoverer/OSGI-INF/l10n/bundle.properties
@@ -12,4 +12,4 @@
 Bundle-Name = MoDisco EjbJar Discoverer (Incubation)

 Bundle-Vendor = Eclipse Modeling Project

 

-discoverer.name = Discover JEE EJB deployment descriptor
\ No newline at end of file
+discoverer.name = Discover JEE EJB deployment descriptor (Deprecated)
\ No newline at end of file
diff --git a/org.eclipse.modisco.jee.ejbjar.discoverer/src/org/eclipse/modisco/jee/ejbjar/discoverer/actions/EjbJarDiscoverer.java b/org.eclipse.modisco.jee.ejbjar.discoverer/src/org/eclipse/modisco/jee/ejbjar/discoverer/actions/EjbJarDiscoverer.java
index 700bc61..00a3ea5 100644
--- a/org.eclipse.modisco.jee.ejbjar.discoverer/src/org/eclipse/modisco/jee/ejbjar/discoverer/actions/EjbJarDiscoverer.java
+++ b/org.eclipse.modisco.jee.ejbjar.discoverer/src/org/eclipse/modisco/jee/ejbjar/discoverer/actions/EjbJarDiscoverer.java
@@ -33,7 +33,8 @@
 /**

  * Discover ejbjar.xml generic model action.

  * 

- * @deprecated use {@link EjbJarDiscoverer2} instead

+ * @deprecated use {@link EjbJarDiscoverer2} instead, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=474891

  */

 @Deprecated

 public class EjbJarDiscoverer extends DeploymentDescriptorDiscoverer {

diff --git a/org.eclipse.modisco.jee.ejbjar/META-INF/MANIFEST.MF b/org.eclipse.modisco.jee.ejbjar/META-INF/MANIFEST.MF
index c503557..b0b6920 100644
--- a/org.eclipse.modisco.jee.ejbjar/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.jee.ejbjar/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %Bundle-Name

 Bundle-SymbolicName: org.eclipse.modisco.jee.ejbjar;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-ClassPath: .

 Bundle-Vendor: %Bundle-Vendor

 Bundle-Localization: plugin

diff --git a/org.eclipse.modisco.jee.facet/META-INF/MANIFEST.MF b/org.eclipse.modisco.jee.facet/META-INF/MANIFEST.MF
index ae429be..dccfa24 100644
--- a/org.eclipse.modisco.jee.facet/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.jee.facet/META-INF/MANIFEST.MF
@@ -2,10 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.jee.facet;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.jee.facet.JEEFacetActivator
 Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime
+ org.eclipse.core.runtime,
+ org.eclipse.gmt.modisco.java;bundle-version="0.13.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: %Bundle-Vendor
diff --git a/org.eclipse.modisco.jee.feature/feature.xml b/org.eclipse.modisco.jee.feature/feature.xml
index ec691e2..cb85399 100644
--- a/org.eclipse.modisco.jee.feature/feature.xml
+++ b/org.eclipse.modisco.jee.feature/feature.xml
@@ -12,7 +12,7 @@
 <feature

       id="org.eclipse.modisco.jee.feature"

       label="MoDisco JEE feature (Incubation)"

-      version="0.12.2.qualifier"

+      version="0.13.2.qualifier"

       provider-name="%providerName"

       plugin="org.eclipse.modisco.jee"

       license-feature="org.eclipse.license"

diff --git a/org.eclipse.modisco.jee.jsp.browser.customization/META-INF/MANIFEST.MF b/org.eclipse.modisco.jee.jsp.browser.customization/META-INF/MANIFEST.MF
index a77d1c7..f576569 100644
--- a/org.eclipse.modisco.jee.jsp.browser.customization/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.jee.jsp.browser.customization/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .,bin
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.modisco.jee.jsp.browser.customization
diff --git a/org.eclipse.modisco.jee.jsp.discoverer.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.jee.jsp.discoverer.tests/META-INF/MANIFEST.MF
index 08ea5b6..e1ce4b2 100644
--- a/org.eclipse.modisco.jee.jsp.discoverer.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.jee.jsp.discoverer.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.jee.jsp.discoverer.tests;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.jee.jsp.discoverer.tests.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.jee.jsp.discoverer.tests/src/org/eclipse/modisco/jee/jsp/discoverer/tests/Activator.java b/org.eclipse.modisco.jee.jsp.discoverer.tests/src/org/eclipse/modisco/jee/jsp/discoverer/tests/Activator.java
index ad55f10..e44a5b2 100644
--- a/org.eclipse.modisco.jee.jsp.discoverer.tests/src/org/eclipse/modisco/jee/jsp/discoverer/tests/Activator.java
+++ b/org.eclipse.modisco.jee.jsp.discoverer.tests/src/org/eclipse/modisco/jee/jsp/discoverer/tests/Activator.java
@@ -16,7 +16,9 @@
 

 /**

  * The activator class controls the plug-in life cycle

+ * @deprecated Will become internal cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470609

  */

+@Deprecated

 public class Activator extends AbstractUIPlugin {

 

 	// The plug-in ID

diff --git a/org.eclipse.modisco.jee.jsp.discoverer.tests/src/org/eclipse/modisco/jee/jsp/discoverer/tests/compatibility/AllTests.java b/org.eclipse.modisco.jee.jsp.discoverer.tests/src/org/eclipse/modisco/jee/jsp/discoverer/tests/compatibility/AllTests.java
index 339295e..1f74730 100644
--- a/org.eclipse.modisco.jee.jsp.discoverer.tests/src/org/eclipse/modisco/jee/jsp/discoverer/tests/compatibility/AllTests.java
+++ b/org.eclipse.modisco.jee.jsp.discoverer.tests/src/org/eclipse/modisco/jee/jsp/discoverer/tests/compatibility/AllTests.java
@@ -17,6 +17,10 @@
 import org.junit.runners.Suite;

 import org.junit.runners.Suite.SuiteClasses;

 

+/**

+ * @deprecated cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=474894

+ */

+@Deprecated

 @SuppressWarnings("deprecation")

 @RunWith(Suite.class)

 @SuiteClasses({TestJsp.class, TestJSPStdAction.class, TestMemory.class, TestHtml.class })

diff --git a/org.eclipse.modisco.jee.jsp.discoverer.tests/src/org/eclipse/modisco/jee/jsp/discoverer/tests/compatibility/TestHtml.java b/org.eclipse.modisco.jee.jsp.discoverer.tests/src/org/eclipse/modisco/jee/jsp/discoverer/tests/compatibility/TestHtml.java
index e853fb0..6f37b85 100644
--- a/org.eclipse.modisco.jee.jsp.discoverer.tests/src/org/eclipse/modisco/jee/jsp/discoverer/tests/compatibility/TestHtml.java
+++ b/org.eclipse.modisco.jee.jsp.discoverer.tests/src/org/eclipse/modisco/jee/jsp/discoverer/tests/compatibility/TestHtml.java
@@ -35,7 +35,9 @@
 import org.eclipse.modisco.jee.jsp.discoverer.tests.Activator;

 import org.junit.Test;

 import org.osgi.framework.Bundle;

-

+/**

+ * @deprecated cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=474894

+ */

 @Deprecated

 public class TestHtml {

 

diff --git a/org.eclipse.modisco.jee.jsp.discoverer.tests/src/org/eclipse/modisco/jee/jsp/discoverer/tests/compatibility/TestJSPStdAction.java b/org.eclipse.modisco.jee.jsp.discoverer.tests/src/org/eclipse/modisco/jee/jsp/discoverer/tests/compatibility/TestJSPStdAction.java
index 234a791..6abf5cf 100644
--- a/org.eclipse.modisco.jee.jsp.discoverer.tests/src/org/eclipse/modisco/jee/jsp/discoverer/tests/compatibility/TestJSPStdAction.java
+++ b/org.eclipse.modisco.jee.jsp.discoverer.tests/src/org/eclipse/modisco/jee/jsp/discoverer/tests/compatibility/TestJSPStdAction.java
@@ -42,6 +42,9 @@
 import org.junit.Test;

 import org.osgi.framework.Bundle;

 

+/**

+ * @deprecated cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=474894

+ */

 @Deprecated

 public class TestJSPStdAction {

 

diff --git a/org.eclipse.modisco.jee.jsp.discoverer.tests/src/org/eclipse/modisco/jee/jsp/discoverer/tests/compatibility/TestJsp.java b/org.eclipse.modisco.jee.jsp.discoverer.tests/src/org/eclipse/modisco/jee/jsp/discoverer/tests/compatibility/TestJsp.java
index 7a91d61..cc2d293 100644
--- a/org.eclipse.modisco.jee.jsp.discoverer.tests/src/org/eclipse/modisco/jee/jsp/discoverer/tests/compatibility/TestJsp.java
+++ b/org.eclipse.modisco.jee.jsp.discoverer.tests/src/org/eclipse/modisco/jee/jsp/discoverer/tests/compatibility/TestJsp.java
@@ -49,6 +49,9 @@
 import org.junit.Test;

 import org.osgi.framework.Bundle;

 

+/**

+ * @deprecated cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=474894

+ */

 @Deprecated

 public class TestJsp {

 

diff --git a/org.eclipse.modisco.jee.jsp.discoverer.tests/src/org/eclipse/modisco/jee/jsp/discoverer/tests/compatibility/TestMemory.java b/org.eclipse.modisco.jee.jsp.discoverer.tests/src/org/eclipse/modisco/jee/jsp/discoverer/tests/compatibility/TestMemory.java
index 3dc4309..f282b5c 100644
--- a/org.eclipse.modisco.jee.jsp.discoverer.tests/src/org/eclipse/modisco/jee/jsp/discoverer/tests/compatibility/TestMemory.java
+++ b/org.eclipse.modisco.jee.jsp.discoverer.tests/src/org/eclipse/modisco/jee/jsp/discoverer/tests/compatibility/TestMemory.java
@@ -30,6 +30,9 @@
 import org.junit.Test;

 import org.osgi.framework.Bundle;

 

+/**

+ * @deprecated cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=474894

+ */

 @Deprecated

 public class TestMemory {

 

diff --git a/org.eclipse.modisco.jee.jsp.discoverer.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.jee.jsp.discoverer.ui/META-INF/MANIFEST.MF
index 96c0918..69a951b 100644
--- a/org.eclipse.modisco.jee.jsp.discoverer.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.jee.jsp.discoverer.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.jee.jsp.discoverer.ui;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.jee.jsp.discoverer.ui.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.modisco.jee.jsp.discoverer/META-INF/MANIFEST.MF b/org.eclipse.modisco.jee.jsp.discoverer/META-INF/MANIFEST.MF
index 638eec7..dca4a14 100644
--- a/org.eclipse.modisco.jee.jsp.discoverer/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.jee.jsp.discoverer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.jee.jsp.discoverer;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.jee.jsp.discoverer.JspActivator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.modisco.jee.jsp.discoverer/OSGI-INF/l10n/bundle.properties b/org.eclipse.modisco.jee.jsp.discoverer/OSGI-INF/l10n/bundle.properties
index 03fe5f5..60872ba 100644
--- a/org.eclipse.modisco.jee.jsp.discoverer/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.modisco.jee.jsp.discoverer/OSGI-INF/l10n/bundle.properties
@@ -10,8 +10,8 @@
 #      Nicolas Guyomar (Mia-Software) - initial API and implementation

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

 #Properties file for org.eclipse.modisco.jee.jsp.discoverer

-discoverer.name1 = Discover JSP Model from JEE Project 

-discoverer.name2 = Discover JSP Model from JSP File

-discoverer.name3 = Discover JSP Model from JEE Container

+discoverer.name1 = Discover JSP Model from JEE Project (Deprecated)

+discoverer.name2 = Discover JSP Model from JSP File (Deprecated)

+discoverer.name3 = Discover JSP Model from JEE Container (Deprecated)

 Bundle-Vendor = Eclipse Modeling Project

 Bundle-Name = MoDisco Java Server Pages Discoverer (Incubation)

diff --git a/org.eclipse.modisco.jee.jsp.discoverer/src/org/eclipse/modisco/jee/jsp/discoverer/AbstractJspDiscoverer.java b/org.eclipse.modisco.jee.jsp.discoverer/src/org/eclipse/modisco/jee/jsp/discoverer/AbstractJspDiscoverer.java
index ec4216f..7475145 100644
--- a/org.eclipse.modisco.jee.jsp.discoverer/src/org/eclipse/modisco/jee/jsp/discoverer/AbstractJspDiscoverer.java
+++ b/org.eclipse.modisco.jee.jsp.discoverer/src/org/eclipse/modisco/jee/jsp/discoverer/AbstractJspDiscoverer.java
@@ -8,6 +8,7 @@
  * Contributors:

  *    Fabien Giquel (Mia-Software) - initial API and implementation

  *    Nicolas Bros (Mia-Software) - adapted to new discovery framework (Bug 335003)

+ *    Fabien Giquel (Mia-Software) - upper case files extensions are not supported (Bug 463078)

  *********************************************************************************/

 package org.eclipse.modisco.jee.jsp.discoverer;

 

@@ -55,7 +56,11 @@
 	}

 

 	public static boolean isJspExtension(final String extension) {

-		return getExtensionList().contains(extension);

+		boolean result = false;

+		if (extension != null) {

+			result = getExtensionList().contains(extension.toLowerCase());

+		}

+		return result;

 	}

 

 	/** Discovers the given file into the given JSP model. */

diff --git a/org.eclipse.modisco.jee.jsp.discoverer/src/org/eclipse/modisco/jee/jsp/discoverer/Messages.java b/org.eclipse.modisco.jee.jsp.discoverer/src/org/eclipse/modisco/jee/jsp/discoverer/Messages.java
index b3f366e..32882aa 100644
--- a/org.eclipse.modisco.jee.jsp.discoverer/src/org/eclipse/modisco/jee/jsp/discoverer/Messages.java
+++ b/org.eclipse.modisco.jee.jsp.discoverer/src/org/eclipse/modisco/jee/jsp/discoverer/Messages.java
@@ -12,6 +12,11 @@
 

 import org.eclipse.osgi.util.NLS;

 

+/**

+ * @deprecated Will be removed,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470701

+ */

+@Deprecated

 public class Messages extends NLS {

 	private static final String BUNDLE_NAME = "org.eclipse.modisco.jee.jsp.discoverer.messages"; //$NON-NLS-1$

 	public static String discoveringJspModel;

diff --git a/org.eclipse.modisco.jee.jsp.discoverer/src/org/eclipse/modisco/jee/jsp/discoverer/actions/DefaultDiscoverer.java b/org.eclipse.modisco.jee.jsp.discoverer/src/org/eclipse/modisco/jee/jsp/discoverer/actions/DefaultDiscoverer.java
index b845c54..442dc76 100644
--- a/org.eclipse.modisco.jee.jsp.discoverer/src/org/eclipse/modisco/jee/jsp/discoverer/actions/DefaultDiscoverer.java
+++ b/org.eclipse.modisco.jee.jsp.discoverer/src/org/eclipse/modisco/jee/jsp/discoverer/actions/DefaultDiscoverer.java
@@ -19,7 +19,8 @@
 import org.eclipse.gmt.modisco.infra.discoverymanager.DiscoveryParameterImpl;

 

 /**

- * @deprecated use matching org.eclipse.modisco.jee.jsp.discoverer classes

+ * @deprecated use matching org.eclipse.modisco.jee.jsp.discoverer classes, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=474894

  */

 @Deprecated

 public abstract class DefaultDiscoverer implements Discoverer {

diff --git a/org.eclipse.modisco.jee.jsp.discoverer/src/org/eclipse/modisco/jee/jsp/discoverer/actions/DiscoverJspModelFromContainer.java b/org.eclipse.modisco.jee.jsp.discoverer/src/org/eclipse/modisco/jee/jsp/discoverer/actions/DiscoverJspModelFromContainer.java
index 3e5d69a..24fd242 100644
--- a/org.eclipse.modisco.jee.jsp.discoverer/src/org/eclipse/modisco/jee/jsp/discoverer/actions/DiscoverJspModelFromContainer.java
+++ b/org.eclipse.modisco.jee.jsp.discoverer/src/org/eclipse/modisco/jee/jsp/discoverer/actions/DiscoverJspModelFromContainer.java
@@ -37,7 +37,7 @@
 

 /**

  * @deprecated use {@link DiscoverJspModelFromResource} or {@link DiscoverJspModelFromJavaElement}

- *             instead

+ *             instead, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=474894

  */

 @Deprecated

 public class DiscoverJspModelFromContainer extends DefaultDiscoverer {

diff --git a/org.eclipse.modisco.jee.jsp.discoverer/src/org/eclipse/modisco/jee/jsp/discoverer/actions/DiscoverJspModelFromFile.java b/org.eclipse.modisco.jee.jsp.discoverer/src/org/eclipse/modisco/jee/jsp/discoverer/actions/DiscoverJspModelFromFile.java
index bb0f377..eaa5724 100644
--- a/org.eclipse.modisco.jee.jsp.discoverer/src/org/eclipse/modisco/jee/jsp/discoverer/actions/DiscoverJspModelFromFile.java
+++ b/org.eclipse.modisco.jee.jsp.discoverer/src/org/eclipse/modisco/jee/jsp/discoverer/actions/DiscoverJspModelFromFile.java
@@ -36,7 +36,7 @@
 

 /**

  * @deprecated use {@link DiscoverJspModelFromResource} or {@link DiscoverJspModelFromJavaElement}

- *             instead

+ *             instead, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=474894

  */

 @Deprecated

 public class DiscoverJspModelFromFile extends DefaultDiscoverer {

diff --git a/org.eclipse.modisco.jee.jsp.discoverer/src/org/eclipse/modisco/jee/jsp/discoverer/actions/DiscoverJspModelFromProject.java b/org.eclipse.modisco.jee.jsp.discoverer/src/org/eclipse/modisco/jee/jsp/discoverer/actions/DiscoverJspModelFromProject.java
index 47a966d..1567a83 100644
--- a/org.eclipse.modisco.jee.jsp.discoverer/src/org/eclipse/modisco/jee/jsp/discoverer/actions/DiscoverJspModelFromProject.java
+++ b/org.eclipse.modisco.jee.jsp.discoverer/src/org/eclipse/modisco/jee/jsp/discoverer/actions/DiscoverJspModelFromProject.java
@@ -36,7 +36,7 @@
 

 /**

  * @deprecated use {@link DiscoverJspModelFromResource} or {@link DiscoverJspModelFromJavaElement}

- *             instead

+ *             instead, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=474894

  */

 @Deprecated

 public class DiscoverJspModelFromProject extends DefaultDiscoverer {

diff --git a/org.eclipse.modisco.jee.jsp.generation.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.jee.jsp.generation.tests/META-INF/MANIFEST.MF
index a4a4de5..ecfcf5e 100644
--- a/org.eclipse.modisco.jee.jsp.generation.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.jee.jsp.generation.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.jee.jsp.generation.tests
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.jee.jsp.generation.tests.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.modisco.jee.jsp.generation.tests/src/org/eclipse/modisco/jee/jsp/generation/tests/Activator.java b/org.eclipse.modisco.jee.jsp.generation.tests/src/org/eclipse/modisco/jee/jsp/generation/tests/Activator.java
index e32b698..91af7ba 100644
--- a/org.eclipse.modisco.jee.jsp.generation.tests/src/org/eclipse/modisco/jee/jsp/generation/tests/Activator.java
+++ b/org.eclipse.modisco.jee.jsp.generation.tests/src/org/eclipse/modisco/jee/jsp/generation/tests/Activator.java
@@ -16,7 +16,9 @@
 

 /**

  * The activator class controls the plug-in life cycle

+ * @deprecated Will become internal cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470609

  */

+@Deprecated

 public class Activator extends AbstractUIPlugin {

 

 	// The plug-in ID

diff --git a/org.eclipse.modisco.jee.jsp.generation/META-INF/MANIFEST.MF b/org.eclipse.modisco.jee.jsp.generation/META-INF/MANIFEST.MF
index 7b1c477..61cd080 100644
--- a/org.eclipse.modisco.jee.jsp.generation/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.jee.jsp.generation/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %Bundle-Name

 Bundle-SymbolicName: org.eclipse.modisco.jee.jsp.generation

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-Activator: org.eclipse.modisco.jee.jsp.generation.Activator

 Bundle-Vendor: %Bundle-Vendor

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

diff --git a/org.eclipse.modisco.jee.jsp/META-INF/MANIFEST.MF b/org.eclipse.modisco.jee.jsp/META-INF/MANIFEST.MF
index aa0b36f..615fe72 100644
--- a/org.eclipse.modisco.jee.jsp/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.jee.jsp/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %Bundle-Name

 Bundle-SymbolicName: org.eclipse.modisco.jee.jsp;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-ClassPath: .

 Bundle-Vendor: %Bundle-Vendor

 Bundle-Localization: plugin

diff --git a/org.eclipse.modisco.jee.queries.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.jee.queries.tests/META-INF/MANIFEST.MF
index f31803a..91ce1f6 100644
--- a/org.eclipse.modisco.jee.queries.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.jee.queries.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.jee.queries.tests;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.jee.queries.tests.JUnitPlugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.jee.queries/META-INF/MANIFEST.MF b/org.eclipse.modisco.jee.queries/META-INF/MANIFEST.MF
index 07b3422..28808a1 100644
--- a/org.eclipse.modisco.jee.queries/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.jee.queries/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.jee.queries;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.jee.queries.JEEQueriesActivator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.jee.webapp.discoverer.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.jee.webapp.discoverer.tests/META-INF/MANIFEST.MF
index 7131b4d..11c8130 100644
--- a/org.eclipse.modisco.jee.webapp.discoverer.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.jee.webapp.discoverer.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.jee.webapp.discoverer.tests
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/AllTestsInUIThread.java b/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/AllTestsInUIThread.java
index f32c77f..add12b4 100644
--- a/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/AllTestsInUIThread.java
+++ b/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/AllTestsInUIThread.java
@@ -19,7 +19,7 @@
 @SuiteClasses({

 	TestCommentedDocType.class,

 	TestNoVersion.class,

-	/* TestNoUri.class, disabled because of Bug 354468 : the test doesn't finish */

+	TestNoUri.class,

 	TestWebXml22.class,

 	TestWebXml23.class,

 	TestWebXml24.class,

diff --git a/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/compatibility/AllTestsInUIThread.java b/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/compatibility/AllTestsInUIThread.java
index 07d2e45..7778e5d 100644
--- a/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/compatibility/AllTestsInUIThread.java
+++ b/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/compatibility/AllTestsInUIThread.java
@@ -14,7 +14,10 @@
 import org.junit.runner.RunWith;

 import org.junit.runners.Suite;

 import org.junit.runners.Suite.SuiteClasses;

-

+/**

+ * @deprecated cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=474893

+ */

+@Deprecated

 @RunWith(Suite.class)

 @SuiteClasses({

 	TestCommentedDocType.class,

diff --git a/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/compatibility/TestCommentedDocType.java b/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/compatibility/TestCommentedDocType.java
index a7bb2b4..ca27fb0 100644
--- a/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/compatibility/TestCommentedDocType.java
+++ b/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/compatibility/TestCommentedDocType.java
@@ -34,8 +34,9 @@
 /**

  * Test of discovering a WEB.XML model 2.4 The specified file does not contain a

  * declaration of xsd, only the version

- * 

+ * @deprecated cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=474893

  */

+@Deprecated

 public class TestCommentedDocType {

 

 	private static final String RESOURCES_TEST1_XML = "/resources/TestCommentedDocType.xml"; //$NON-NLS-1$

diff --git a/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/compatibility/TestNoUri.java b/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/compatibility/TestNoUri.java
index 3b4482a..96788b1 100644
--- a/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/compatibility/TestNoUri.java
+++ b/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/compatibility/TestNoUri.java
@@ -34,8 +34,9 @@
 /**

  * Test of discovering a WEB.XML model 2.4 The specified file does not contain a

  * declaration of xsd, only the version

- * 

+ * @deprecated cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=474893

  */

+@Deprecated

 public class TestNoUri {

 

 	private static final String RESOURCES_TEST1_XML = "/resources/TestNoUri.xml"; //$NON-NLS-1$

diff --git a/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/compatibility/TestNoVersion.java b/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/compatibility/TestNoVersion.java
index 3b24cc7..2254ed5 100644
--- a/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/compatibility/TestNoVersion.java
+++ b/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/compatibility/TestNoVersion.java
@@ -34,7 +34,9 @@
 /**

  * Test of discovering a WEB.XML model 2.4 The specified file does not contain a

  * declaration of version, only the XSD

+ * @deprecated cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=474893

  */

+@Deprecated

 public class TestNoVersion {

 

 	private static final String RESOURCES_TEST1_XML = "/resources/TestNoVersion.xml"; //$NON-NLS-1$

diff --git a/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/compatibility/TestWebXml22.java b/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/compatibility/TestWebXml22.java
index 62462fa..e39354b 100644
--- a/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/compatibility/TestWebXml22.java
+++ b/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/compatibility/TestWebXml22.java
@@ -42,8 +42,9 @@
 

 /**

  * Test of discovering a WEB.XML model 2.2

- * 

+ * @deprecated cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=474893

  */

+@Deprecated

 public class TestWebXml22 {

 

 	private static final String RESOURCES_TEST_XML = "/resources/TestWebXml22.xml"; //$NON-NLS-1$

diff --git a/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/compatibility/TestWebXml23.java b/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/compatibility/TestWebXml23.java
index 4040470..e3f6f4d 100644
--- a/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/compatibility/TestWebXml23.java
+++ b/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/compatibility/TestWebXml23.java
@@ -42,8 +42,9 @@
 

 /**

  * Test of discovering a WEB.XML model 2.3

- * 

+ * @deprecated cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=474893

  */

+@Deprecated

 public class TestWebXml23 {

 

 	private static final String RESOURCES_TEST_XML = "/resources/TestWebXml23.xml"; //$NON-NLS-1$	

diff --git a/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/compatibility/TestWebXml24.java b/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/compatibility/TestWebXml24.java
index 9c06bc6..d14de66 100644
--- a/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/compatibility/TestWebXml24.java
+++ b/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/compatibility/TestWebXml24.java
@@ -42,8 +42,9 @@
 

 /**

  * Test of discovering a WEB.XML model 2.4

- * 

+ * @deprecated cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=474893

  */

+@Deprecated

 public class TestWebXml24 {

 

 	private static final String RESOURCES_TEST1_XML = "/resources/TestWebXml24.xml"; //$NON-NLS-1$

diff --git a/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/compatibility/TestWebXml25.java b/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/compatibility/TestWebXml25.java
index fa455a7..da8f6f6 100644
--- a/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/compatibility/TestWebXml25.java
+++ b/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/compatibility/TestWebXml25.java
@@ -42,8 +42,9 @@
 

 /**

  * Test of discovering a WEB.XML model 2.5

- * 

+ * @deprecated cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=474893

  */

+@Deprecated

 public class TestWebXml25 {

 

 	private static final String RESOURCES_TEST1_XML = "/resources/TestWebXml25.xml"; //$NON-NLS-1$

diff --git a/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/compatibility/TestWebXml30.java b/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/compatibility/TestWebXml30.java
index 014d5ed..40b831f 100644
--- a/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/compatibility/TestWebXml30.java
+++ b/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/compatibility/TestWebXml30.java
@@ -42,8 +42,9 @@
 

 /**

  * Test of discovering a WEB.XML model 3.0

- * 

+ * @deprecated cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=474893

  */

+@Deprecated

 public class TestWebXml30 {

 

 	private static final String RESOURCES_TEST1_XML = "/resources/TestWebXml30.xml"; //$NON-NLS-1$

diff --git a/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/compatibility/package-info.java b/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/compatibility/package-info.java
index eb28dc5..51d986b 100644
--- a/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/compatibility/package-info.java
+++ b/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/compatibility/package-info.java
@@ -9,5 +9,10 @@
  *    Nicolas Bros (Mia-Software)

  *******************************************************************************/

 

-/** This package contains tests for the old discovery framework, kept for compatibility reasons */

+/**

+ * This package contains tests for the old discovery framework, kept for

+ * compatibility reasons

+ * 

+ * @deprecated cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=474893

+ */

 package org.eclipse.modisco.jee.webapp.discoverer.tests.compatibility;
\ No newline at end of file
diff --git a/org.eclipse.modisco.jee.webapp.discoverer.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.jee.webapp.discoverer.ui/META-INF/MANIFEST.MF
index 108f662..f31b259 100644
--- a/org.eclipse.modisco.jee.webapp.discoverer.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.jee.webapp.discoverer.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.jee.webapp.discoverer.ui;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.jee.webapp.discoverer.ui.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.modisco.jee.webapp.discoverer/META-INF/MANIFEST.MF b/org.eclipse.modisco.jee.webapp.discoverer/META-INF/MANIFEST.MF
index d60ceca..5745743 100644
--- a/org.eclipse.modisco.jee.webapp.discoverer/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.jee.webapp.discoverer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.jee.webapp.discoverer;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.jee.webapp.discoverer.WebXmlActivator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.jee.webapp.discoverer/OSGI-INF/l10n/bundle.properties b/org.eclipse.modisco.jee.webapp.discoverer/OSGI-INF/l10n/bundle.properties
index 4ce2098..d0c2709 100644
--- a/org.eclipse.modisco.jee.webapp.discoverer/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.modisco.jee.webapp.discoverer/OSGI-INF/l10n/bundle.properties
@@ -12,4 +12,4 @@
 Bundle-Name = MoDisco WebApp Discoverer (Incubation)

 Bundle-Vendor = Eclipse Modeling Project

 

-discoverer.name = Discover JEE Web deployment descriptor
\ No newline at end of file
+discoverer.name = Discover JEE Web deployment descriptor (Deprecated)
\ No newline at end of file
diff --git a/org.eclipse.modisco.jee.webapp.discoverer/src/org/eclipse/modisco/jee/webapp/discoverer/actions/WebXmlDiscoverer.java b/org.eclipse.modisco.jee.webapp.discoverer/src/org/eclipse/modisco/jee/webapp/discoverer/actions/WebXmlDiscoverer.java
index afbcda7..4e17187 100644
--- a/org.eclipse.modisco.jee.webapp.discoverer/src/org/eclipse/modisco/jee/webapp/discoverer/actions/WebXmlDiscoverer.java
+++ b/org.eclipse.modisco.jee.webapp.discoverer/src/org/eclipse/modisco/jee/webapp/discoverer/actions/WebXmlDiscoverer.java
@@ -33,7 +33,8 @@
 /**

  * Discover web.xml generic model action.

  * 

- * @deprecated use {@link WebXmlDiscoverer2} instead

+ * @deprecated use {@link WebXmlDiscoverer2} instead, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=474893

  */

 @Deprecated

 public class WebXmlDiscoverer extends DeploymentDescriptorDiscoverer {

diff --git a/org.eclipse.modisco.jee.webapp/META-INF/MANIFEST.MF b/org.eclipse.modisco.jee.webapp/META-INF/MANIFEST.MF
index ca5153b..9594d5d 100644
--- a/org.eclipse.modisco.jee.webapp/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.jee.webapp/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %Bundle-Name

 Bundle-SymbolicName: org.eclipse.modisco.jee.webapp;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-ClassPath: .

 Bundle-Localization: plugin

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/org.eclipse.modisco.jee/META-INF/MANIFEST.MF b/org.eclipse.modisco.jee/META-INF/MANIFEST.MF
index 9b2e4a0..809285f 100644
--- a/org.eclipse.modisco.jee/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.jee/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.jee;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.gmt.modisco.infra.discoverymanager;bundle-version="0.9.0",
diff --git a/org.eclipse.modisco.jee/src/org/eclipse/modisco/jee/actions/DeploymentDescriptorDiscoverer.java b/org.eclipse.modisco.jee/src/org/eclipse/modisco/jee/actions/DeploymentDescriptorDiscoverer.java
index bef65d5..7cfcf52 100644
--- a/org.eclipse.modisco.jee/src/org/eclipse/modisco/jee/actions/DeploymentDescriptorDiscoverer.java
+++ b/org.eclipse.modisco.jee/src/org/eclipse/modisco/jee/actions/DeploymentDescriptorDiscoverer.java
@@ -56,7 +56,8 @@
  * 

  * A default implementation for discovering JEE configuration file

  * 

- * @deprecated replaced by {@link AbstractDeploymentDescriptorDiscoverer}

+ * @deprecated replaced by {@link AbstractDeploymentDescriptorDiscoverer}, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=474883

  */

 @Deprecated

 public abstract class DeploymentDescriptorDiscoverer implements Discoverer {

diff --git a/org.eclipse.modisco.jee/src/org/eclipse/modisco/jee/actions/Messages.java b/org.eclipse.modisco.jee/src/org/eclipse/modisco/jee/actions/Messages.java
index dd109a7..34644d5 100644
--- a/org.eclipse.modisco.jee/src/org/eclipse/modisco/jee/actions/Messages.java
+++ b/org.eclipse.modisco.jee/src/org/eclipse/modisco/jee/actions/Messages.java
@@ -15,6 +15,11 @@
 

 import org.eclipse.osgi.util.NLS;

 

+/**

+ * @deprecated Will be removed,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470701

+ */

+@Deprecated

 public class Messages extends NLS {

 	private static final String BUNDLE_NAME = "org.eclipse.modisco.jee.actions.messages"; //$NON-NLS-1$

 	public static String DeployementDescriptorDiscoverer_0;

diff --git a/org.eclipse.modisco.jee/src/org/eclipse/modisco/jee/actions/ProjectDeploymentDescriptorDiscoverer.java b/org.eclipse.modisco.jee/src/org/eclipse/modisco/jee/actions/ProjectDeploymentDescriptorDiscoverer.java
index a5e3f9b..ce5c657 100644
--- a/org.eclipse.modisco.jee/src/org/eclipse/modisco/jee/actions/ProjectDeploymentDescriptorDiscoverer.java
+++ b/org.eclipse.modisco.jee/src/org/eclipse/modisco/jee/actions/ProjectDeploymentDescriptorDiscoverer.java
@@ -59,7 +59,8 @@
  * The proposed class facilitates the creation of new Deployement Descriptor discoverer on a

  * container.

  * 

- * @deprecated replaced by {@link AbstractProjectDeploymentDescriptorDiscoverer}

+ * @deprecated replaced by {@link AbstractProjectDeploymentDescriptorDiscoverer}, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=474883

  * 

  */

 @Deprecated

diff --git a/org.eclipse.modisco.kdm.source.discoverer.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.kdm.source.discoverer.ui/META-INF/MANIFEST.MF
index 9759a96..976be6b 100644
--- a/org.eclipse.modisco.kdm.source.discoverer.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.kdm.source.discoverer.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.kdm.source.discoverer.ui;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.kdm.source.discoverer.ui.internal.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.modisco.kdm.source.discoverer/META-INF/MANIFEST.MF b/org.eclipse.modisco.kdm.source.discoverer/META-INF/MANIFEST.MF
index f5de459..7c0ab10 100644
--- a/org.eclipse.modisco.kdm.source.discoverer/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.kdm.source.discoverer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.kdm.source.discoverer;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.kdm.source.discoverer.internal.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.kdm.source.extension.ui.browser/META-INF/MANIFEST.MF b/org.eclipse.modisco.kdm.source.extension.ui.browser/META-INF/MANIFEST.MF
index 2c305df..755513a 100644
--- a/org.eclipse.modisco.kdm.source.extension.ui.browser/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.kdm.source.extension.ui.browser/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.kdm.source.extension.ui.browser;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.kdm.source.extension.ui.browser.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.modisco.kdm.source.extension.ui.browser/OSGI-INF/l10n/bundle.properties b/org.eclipse.modisco.kdm.source.extension.ui.browser/OSGI-INF/l10n/bundle.properties
index 98fb437..842fc73 100644
--- a/org.eclipse.modisco.kdm.source.extension.ui.browser/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.modisco.kdm.source.extension.ui.browser/OSGI-INF/l10n/bundle.properties
@@ -10,4 +10,4 @@
 ###############################################################################

 #Properties file for org.eclipse.modisco.kdm.source.extension.ui.browser

 Bundle-Vendor = Eclipse Modeling Project

-Bundle-Name = MoDisco Browser extension for code synchronization (Incubation)
\ No newline at end of file
+Bundle-Name = MoDisco Browser extension for code synchronization (Deprecated) (Incubation)
\ No newline at end of file
diff --git a/org.eclipse.modisco.kdm.source.extension.ui.browser/src/org/eclipse/modisco/kdm/source/extension/ui/browser/Activator.java b/org.eclipse.modisco.kdm.source.extension.ui.browser/src/org/eclipse/modisco/kdm/source/extension/ui/browser/Activator.java
index 87d7d99..52100d3 100644
--- a/org.eclipse.modisco.kdm.source.extension.ui.browser/src/org/eclipse/modisco/kdm/source/extension/ui/browser/Activator.java
+++ b/org.eclipse.modisco.kdm.source.extension.ui.browser/src/org/eclipse/modisco/kdm/source/extension/ui/browser/Activator.java
@@ -19,7 +19,9 @@
 

 /**

  * The activator class controls the plug-in life cycle

+ * @deprecated cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=475243

  */

+@Deprecated

 public class Activator extends AbstractUIPlugin {

 

 	// The plug-in ID

diff --git a/org.eclipse.modisco.kdm.source.extension.ui.browser/src/org/eclipse/modisco/kdm/source/extension/ui/browser/listener/ModelBrowserListener.java b/org.eclipse.modisco.kdm.source.extension.ui.browser/src/org/eclipse/modisco/kdm/source/extension/ui/browser/listener/ModelBrowserListener.java
index 627b847..903e322 100644
--- a/org.eclipse.modisco.kdm.source.extension.ui.browser/src/org/eclipse/modisco/kdm/source/extension/ui/browser/listener/ModelBrowserListener.java
+++ b/org.eclipse.modisco.kdm.source.extension.ui.browser/src/org/eclipse/modisco/kdm/source/extension/ui/browser/listener/ModelBrowserListener.java
@@ -23,7 +23,9 @@
  * This class only map the event "doubleClick" in the browser in order to call

  * the openEObjectContainerFile method without adding a dependency between

  * MoDisco Browser and kdm.source.extension

+ * @deprecated cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=475243

  */

+@Deprecated

 public class ModelBrowserListener implements DoubleClickListener {

 

 	public void synchronizeEObject(final EObject eObject,

diff --git a/org.eclipse.modisco.kdm.source.extension.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.kdm.source.extension.ui/META-INF/MANIFEST.MF
index 1964716..248b35a 100644
--- a/org.eclipse.modisco.kdm.source.extension.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.kdm.source.extension.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.kdm.source.extension.ui;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.kdm.source.extension.ui.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.ide;bundle-version="3.6.0",
diff --git a/org.eclipse.modisco.kdm.source.extension/META-INF/MANIFEST.MF b/org.eclipse.modisco.kdm.source.extension/META-INF/MANIFEST.MF
index e1917e2..115b325 100644
--- a/org.eclipse.modisco.kdm.source.extension/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.kdm.source.extension/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.kdm.source.extension;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Activator: org.eclipse.modisco.kdm.source.extension.Activator
diff --git a/org.eclipse.modisco.kdm.source.extension/src/org/eclipse/modisco/kdm/source/extension/discovery/AbstractComposedKDMSourceDiscoverer.java b/org.eclipse.modisco.kdm.source.extension/src/org/eclipse/modisco/kdm/source/extension/discovery/AbstractComposedKDMSourceDiscoverer.java
index 1fdcd01..6315479 100644
--- a/org.eclipse.modisco.kdm.source.extension/src/org/eclipse/modisco/kdm/source/extension/discovery/AbstractComposedKDMSourceDiscoverer.java
+++ b/org.eclipse.modisco.kdm.source.extension/src/org/eclipse/modisco/kdm/source/extension/discovery/AbstractComposedKDMSourceDiscoverer.java
@@ -48,7 +48,8 @@
  * 

  * See Help Contents or http://wiki.eclipse.org/MoDisco/Components/KDMSourceExtension

  * 

- * @deprecated use AbstractComposedKDMSourceDiscoverer2 instead with the new discovery framework

+ * @deprecated use AbstractComposedKDMSourceDiscoverer2 instead with the new discovery framework,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=474729

  * 

  */

 @Deprecated

diff --git a/org.eclipse.modisco.kdm.source.extension/src/org/eclipse/modisco/kdm/source/extension/discovery/AbstractRegionDiscoverer.java b/org.eclipse.modisco.kdm.source.extension/src/org/eclipse/modisco/kdm/source/extension/discovery/AbstractRegionDiscoverer.java
index fa02fde..71e1b47 100644
--- a/org.eclipse.modisco.kdm.source.extension/src/org/eclipse/modisco/kdm/source/extension/discovery/AbstractRegionDiscoverer.java
+++ b/org.eclipse.modisco.kdm.source.extension/src/org/eclipse/modisco/kdm/source/extension/discovery/AbstractRegionDiscoverer.java
@@ -27,7 +27,8 @@
  * 

  * See also {@link org.eclipse.modisco.kdm.source.extension.discovery.SourceVisitListener}

  * 

- * @deprecated use AbstractRegionDiscoverer2 with the new discovery framework

+ * @deprecated use AbstractRegionDiscoverer2 with the new discovery framework, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=474730

  */

 @Deprecated

 public abstract class AbstractRegionDiscoverer implements Discoverer {

diff --git a/org.eclipse.modisco.kdm.source.extension/src/org/eclipse/modisco/kdm/source/extension/discovery/Messages.java b/org.eclipse.modisco.kdm.source.extension/src/org/eclipse/modisco/kdm/source/extension/discovery/Messages.java
index 54f1b04..6f7c941 100644
--- a/org.eclipse.modisco.kdm.source.extension/src/org/eclipse/modisco/kdm/source/extension/discovery/Messages.java
+++ b/org.eclipse.modisco.kdm.source.extension/src/org/eclipse/modisco/kdm/source/extension/discovery/Messages.java
@@ -13,6 +13,11 @@
 

 import org.eclipse.osgi.util.NLS;

 

+/**

+ * @deprecated Will be removed,

+ *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470701

+ */

+@Deprecated

 public final class Messages extends NLS {

 	private static final String BUNDLE_NAME = "org.eclipse.modisco.kdm.source.extension.discovery.messages"; //$NON-NLS-1$

 	public static String AbstractComposedKDMSourceDiscoverer_0;

diff --git a/org.eclipse.modisco.kdm.uml2converter.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.kdm.uml2converter.tests/META-INF/MANIFEST.MF
index 65cfb25..90d888b 100644
--- a/org.eclipse.modisco.kdm.uml2converter.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.kdm.uml2converter.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.kdm.uml2converter.tests;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui,
  org.eclipse.emf.common,
diff --git a/org.eclipse.modisco.kdm.uml2converter.tests/src/org/eclipse/modisco/kdm/uml2converter/tests/KdmToUml2WithTracesConverterTest.java b/org.eclipse.modisco.kdm.uml2converter.tests/src/org/eclipse/modisco/kdm/uml2converter/tests/KdmToUml2WithTracesConverterTest.java
index 23be966..42bc0e8 100644
--- a/org.eclipse.modisco.kdm.uml2converter.tests/src/org/eclipse/modisco/kdm/uml2converter/tests/KdmToUml2WithTracesConverterTest.java
+++ b/org.eclipse.modisco.kdm.uml2converter.tests/src/org/eclipse/modisco/kdm/uml2converter/tests/KdmToUml2WithTracesConverterTest.java
@@ -238,6 +238,7 @@
 		return output;

 	}

 

+	@Ignore //cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=469150

 	@Test

 	public void testValidationOfConvertedSourceUmlModel() throws Exception {

 

diff --git a/org.eclipse.modisco.kdm.uml2converter.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.kdm.uml2converter.ui/META-INF/MANIFEST.MF
index 8276314..b400d9b 100644
--- a/org.eclipse.modisco.kdm.uml2converter.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.kdm.uml2converter.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.kdm.uml2converter.ui;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.kdm.uml2converter.ui.internal.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.modisco.kdm.uml2converter/META-INF/MANIFEST.MF b/org.eclipse.modisco.kdm.uml2converter/META-INF/MANIFEST.MF
index 99cd5c0..0b4b3de 100644
--- a/org.eclipse.modisco.kdm.uml2converter/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.kdm.uml2converter/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.kdm.uml2converter;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.kdm.uml2converter.internal.KdmToUml2Activator
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ClassPath: .
diff --git a/org.eclipse.modisco.manifest.discoverer.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.manifest.discoverer.ui/META-INF/MANIFEST.MF
index 16836bc..8dbd4f1 100644
--- a/org.eclipse.modisco.manifest.discoverer.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.manifest.discoverer.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.manifest.discoverer.ui;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.manifest.discoverer.ui.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.modisco.manifest.discoverer/META-INF/MANIFEST.MF b/org.eclipse.modisco.manifest.discoverer/META-INF/MANIFEST.MF
index 5f35005..c355087 100644
--- a/org.eclipse.modisco.manifest.discoverer/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.manifest.discoverer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.manifest.discoverer;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.manifest.discoverer.Activator
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources;bundle-version="3.6.0",
diff --git a/org.eclipse.modisco.manifest.discoverer/src/org/eclipse/modisco/manifest/discoverer/Activator.java b/org.eclipse.modisco.manifest.discoverer/src/org/eclipse/modisco/manifest/discoverer/Activator.java
index f2a603e..2fb565e 100644
--- a/org.eclipse.modisco.manifest.discoverer/src/org/eclipse/modisco/manifest/discoverer/Activator.java
+++ b/org.eclipse.modisco.manifest.discoverer/src/org/eclipse/modisco/manifest/discoverer/Activator.java
@@ -15,7 +15,9 @@
 

 /**

  * The activator class controls the plug-in life cycle

+ * @deprecated Will become internal cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470609

  */

+@Deprecated

 public class Activator extends Plugin {

 

 	// The plug-in ID

diff --git a/org.eclipse.modisco.manifest.discoverer/src/org/eclipse/modisco/manifest/discoverer/ManifestModelDiscoverer.java b/org.eclipse.modisco.manifest.discoverer/src/org/eclipse/modisco/manifest/discoverer/ManifestModelDiscoverer.java
index f3e4e84..167ebef 100644
--- a/org.eclipse.modisco.manifest.discoverer/src/org/eclipse/modisco/manifest/discoverer/ManifestModelDiscoverer.java
+++ b/org.eclipse.modisco.manifest.discoverer/src/org/eclipse/modisco/manifest/discoverer/ManifestModelDiscoverer.java
@@ -33,7 +33,10 @@
 import org.eclipse.osgi.util.ManifestElement;

 import org.osgi.framework.BundleException;

 

-/** @deprecated use {@link ManifestModelDiscoverer2} */

+/**

+ * @deprecated use {@link ManifestModelDiscoverer2}, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=474898

+ */

 @Deprecated

 public class ManifestModelDiscoverer implements Discoverer {

 

diff --git a/org.eclipse.modisco.manifest/META-INF/MANIFEST.MF b/org.eclipse.modisco.manifest/META-INF/MANIFEST.MF
index 55beec5..0c8422e 100644
--- a/org.eclipse.modisco.manifest/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.manifest/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %pluginName

 Bundle-SymbolicName: org.eclipse.modisco.manifest;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-ClassPath: .

 Bundle-Vendor: %providerName

 Bundle-Localization: plugin

diff --git a/org.eclipse.modisco.omg.gastm/META-INF/MANIFEST.MF b/org.eclipse.modisco.omg.gastm/META-INF/MANIFEST.MF
index 051942d..7180053 100644
--- a/org.eclipse.modisco.omg.gastm/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.omg.gastm/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %pluginName

 Bundle-SymbolicName: org.eclipse.modisco.omg.gastm;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-ClassPath: .

 Bundle-Vendor: %providerName

 Bundle-Localization: plugin

diff --git a/org.eclipse.modisco.omg.smm/META-INF/MANIFEST.MF b/org.eclipse.modisco.omg.smm/META-INF/MANIFEST.MF
index eadcf36..8fa9e2d 100644
--- a/org.eclipse.modisco.omg.smm/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.omg.smm/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %pluginName

 Bundle-SymbolicName: org.eclipse.modisco.omg.smm;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-ClassPath: .

 Bundle-Vendor: %providerName

 Bundle-Localization: plugin

diff --git a/org.eclipse.modisco.properties.discoverer.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.properties.discoverer.ui/META-INF/MANIFEST.MF
index d343225..c2d8afa 100644
--- a/org.eclipse.modisco.properties.discoverer.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.properties.discoverer.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.properties.discoverer.ui;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.properties.discoverer.ui.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.modisco.properties.discoverer/META-INF/MANIFEST.MF b/org.eclipse.modisco.properties.discoverer/META-INF/MANIFEST.MF
index 33cb85c..50a54db 100644
--- a/org.eclipse.modisco.properties.discoverer/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.properties.discoverer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.properties.discoverer;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.properties.discoverer.Activator
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources;bundle-version="3.6.0",
diff --git a/org.eclipse.modisco.properties.discoverer/OSGI-INF/l10n/bundle.properties b/org.eclipse.modisco.properties.discoverer/OSGI-INF/l10n/bundle.properties
index 9c43917..29599d8 100644
--- a/org.eclipse.modisco.properties.discoverer/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.modisco.properties.discoverer/OSGI-INF/l10n/bundle.properties
@@ -9,6 +9,6 @@
 #    Mia-Software - initial API and implementation

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

 #Properties file for org.eclipse.modisco.properties.discoverer

-discoverer.name = Discover properties model

+discoverer.name = Discover properties model (Deprecated)

 Bundle-Name = MoDisco Properties File Discoverer (Incubation)

 Bundle-Vendor = Eclipse Modeling Project

diff --git a/org.eclipse.modisco.properties.discoverer/src/org/eclipse/modisco/properties/discoverer/Activator.java b/org.eclipse.modisco.properties.discoverer/src/org/eclipse/modisco/properties/discoverer/Activator.java
index 9e31683..dd97cf6 100644
--- a/org.eclipse.modisco.properties.discoverer/src/org/eclipse/modisco/properties/discoverer/Activator.java
+++ b/org.eclipse.modisco.properties.discoverer/src/org/eclipse/modisco/properties/discoverer/Activator.java
@@ -15,7 +15,9 @@
 

 /**

  * The activator class controls the plug-in life cycle

+ * @deprecated Will become internal cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470609

  */

+@Deprecated

 public class Activator extends Plugin {

 

 	// The plug-in ID

diff --git a/org.eclipse.modisco.properties.discoverer/src/org/eclipse/modisco/properties/discoverer/PropertiesModelDiscoverer.java b/org.eclipse.modisco.properties.discoverer/src/org/eclipse/modisco/properties/discoverer/PropertiesModelDiscoverer.java
index 690ff19..e0bb0d9 100644
--- a/org.eclipse.modisco.properties.discoverer/src/org/eclipse/modisco/properties/discoverer/PropertiesModelDiscoverer.java
+++ b/org.eclipse.modisco.properties.discoverer/src/org/eclipse/modisco/properties/discoverer/PropertiesModelDiscoverer.java
@@ -31,7 +31,8 @@
 import org.eclipse.gmt.modisco.omg.kdm.kdm.KdmFactory;

 

 /**

- * @deprecated use {@link PropertiesModelDiscoverer2}

+ * @deprecated use {@link PropertiesModelDiscoverer2}, cf.

+ *             https://bugs.eclipse.org/bugs/show_bug.cgi?id=474900

  */

 @Deprecated

 public class PropertiesModelDiscoverer implements Discoverer {

diff --git a/org.eclipse.modisco.releng.tycho/.settings/org.eclipse.core.resources.prefs b/org.eclipse.modisco.releng.tycho/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..5158445
--- /dev/null
+++ b/org.eclipse.modisco.releng.tycho/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,10 @@
+# Copyright (c) 2015 Mia-Software.

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

+#    Grégoire Dupé - initial implementation

+eclipse.preferences.version=1

+encoding/<project>=UTF-8

diff --git a/org.eclipse.modisco.releng.tycho/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.modisco.releng.tycho/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..6976c4f
--- /dev/null
+++ b/org.eclipse.modisco.releng.tycho/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,10 @@
+# Copyright (c) 2015 Mia-Software.
+# 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:
+#    Grégoire Dupé - initial implementation
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/org.eclipse.modisco.releng.tycho/helios/releng.properties b/org.eclipse.modisco.releng.tycho/helios/releng.properties
index 18ccc01..e658f5d 100644
--- a/org.eclipse.modisco.releng.tycho/helios/releng.properties
+++ b/org.eclipse.modisco.releng.tycho/helios/releng.properties
@@ -20,7 +20,7 @@
 

 #The following informations will be used as maven pom parent informations

 product.group.id=org.eclipse.mdt

-product.version=0.12.2

+product.version=0.13.2

 

 #How the releng tools should find relevant bundles

 updatesite.source.location=${product.source.location}/org.eclipse.modisco.updatesite

@@ -37,7 +37,7 @@
 org.eclipse.emf.facet.releng.tycho.util.configure.test.vmargs=-Xmx1024m -XX:MaxPermSize=256m

 

 org.eclipse.emf.facet.releng.tycho.util.configure.source.idRegex=org\\.eclipse.*modisco.*

-org.eclipse.emf.facet.releng.tycho.util.configure.doc.pattern=org\\.eclipse.*modisco.*

+org.eclipse.emf.facet.releng.tycho.util.configure.doc.pattern=org\\.eclipse(\\.gmt)?\\.modisco\\.((?!test|example).)*

 org.eclipse.emf.facet.releng.tycho.util.configure.statsURI=http://download.eclipse.org/stats

 

 org.eclipse.emf.facet.releng.tycho.util.configure.bugzillaProduct=MDT.MoDisco

diff --git a/org.eclipse.modisco.releng.tycho/helios/targetPlatform.xml b/org.eclipse.modisco.releng.tycho/helios/targetPlatform.xml
index ec63e93..614fe42 100644
--- a/org.eclipse.modisco.releng.tycho/helios/targetPlatform.xml
+++ b/org.eclipse.modisco.releng.tycho/helios/targetPlatform.xml
@@ -16,6 +16,6 @@
             <groupId>org.eclipse.mdt</groupId>

             <artifactId>org.eclipse.modisco.archi.tech.targetplatform</artifactId>

             <classifier>org.eclipse.modisco.archi.tech.targetplatform</classifier>

-            <version>0.12.2</version>

+            <version>0.13.2</version>

          </artifact>

 </target>
\ No newline at end of file
diff --git a/org.eclipse.modisco.releng.tycho/indigo/releng.properties b/org.eclipse.modisco.releng.tycho/indigo/releng.properties
index 775ccc2..0a53ac7 100644
--- a/org.eclipse.modisco.releng.tycho/indigo/releng.properties
+++ b/org.eclipse.modisco.releng.tycho/indigo/releng.properties
@@ -20,7 +20,7 @@
 

 #The following informations will be used as maven pom parent informations

 product.group.id=org.eclipse.mdt

-product.version=0.12.2

+product.version=0.13.2

 

 #How the releng tools should find relevant bundles

 updatesite.source.location=${product.source.location}/org.eclipse.modisco.updatesite

diff --git a/org.eclipse.modisco.releng.tycho/indigo/targetPlatform.xml b/org.eclipse.modisco.releng.tycho/indigo/targetPlatform.xml
index 6fb1666..b6c873a 100644
--- a/org.eclipse.modisco.releng.tycho/indigo/targetPlatform.xml
+++ b/org.eclipse.modisco.releng.tycho/indigo/targetPlatform.xml
@@ -16,6 +16,6 @@
             <groupId>org.eclipse.mdt</groupId>

             <artifactId>org.eclipse.modisco.archi.tech.targetplatform</artifactId>

             <classifier>org.eclipse.modisco.archi.tech.targetplatform-indigo</classifier>

-            <version>0.12.2</version>

+            <version>0.13.2</version>

          </artifact>

 </target>
\ No newline at end of file
diff --git a/org.eclipse.modisco.releng.tycho/local/releng.properties b/org.eclipse.modisco.releng.tycho/local/releng.properties
index 7a79c4f..fc7abd4 100644
--- a/org.eclipse.modisco.releng.tycho/local/releng.properties
+++ b/org.eclipse.modisco.releng.tycho/local/releng.properties
@@ -20,7 +20,7 @@
 

 #The following informations will be used as maven pom parent informations

 product.group.id=org.eclipse.mdt

-product.version=0.12.2

+product.version=0.13.2

 

 #How the releng tools should find relevant bundles

 updatesite.source.location=${product.source.location}/org.eclipse.modisco.updatesite

diff --git a/org.eclipse.modisco.releng.tycho/releasetrain/build.sh b/org.eclipse.modisco.releng.tycho/releasetrain/build.sh
index 2089c34..830efb4 100644
--- a/org.eclipse.modisco.releng.tycho/releasetrain/build.sh
+++ b/org.eclipse.modisco.releng.tycho/releasetrain/build.sh
@@ -8,7 +8,7 @@
 # Contributors:
 #    Grégoire Dupé - initial implementation
 
-RT_VERSION=Luna_maintenance
+RT_VERSION=Mars_maintenance
 
 echo $DISPLAY
 echo $PATH
diff --git a/org.eclipse.modisco.releng.tycho/releasetrain/dependencies_updatesites.xml b/org.eclipse.modisco.releng.tycho/releasetrain/dependencies_updatesites.xml
index 0c06036..4b272ea 100644
--- a/org.eclipse.modisco.releng.tycho/releasetrain/dependencies_updatesites.xml
+++ b/org.eclipse.modisco.releng.tycho/releasetrain/dependencies_updatesites.xml
@@ -20,7 +20,7 @@
 		<repository>

 			<id>Orbit</id>

 			<layout>p2</layout>

-			<url>http://download.eclipse.org/tools/orbit/downloads/drops/R20140114142710/repository/</url>

+			<url>http://download.eclipse.org/tools/orbit/downloads/drops/R20150519210750/repository/</url>

 		</repository>

 		<repository>

 			<id>Eclipse License</id>

diff --git a/org.eclipse.modisco.releng.tycho/releasetrain/releng.properties b/org.eclipse.modisco.releng.tycho/releasetrain/releng.properties
index 384e199..5233d0c 100644
--- a/org.eclipse.modisco.releng.tycho/releasetrain/releng.properties
+++ b/org.eclipse.modisco.releng.tycho/releasetrain/releng.properties
@@ -20,7 +20,7 @@
 

 #The following informations will be used as maven pom parent informations

 product.group.id=org.eclipse.mdt

-product.version=0.12.2

+product.version=0.13.2

 

 #How the releng tools should find relevant bundles

 updatesite.source.location=${product.source.location}/org.eclipse.modisco.updatesite

@@ -35,14 +35,14 @@
 org.eclipse.emf.facet.releng.tycho.util.configure.generateDependencies=true

 org.eclipse.emf.facet.releng.tycho.util.configure.generateDependencies.exclude=**/mdt-modisco.b3aggrcon

 org.eclipse.emf.facet.releng.tycho.util.configure.generateDependencies.orbit=http://download.eclipse.org/tools/orbit/downloads/drops/R20130517111416/repository/

-org.eclipse.emf.facet.releng.tycho.util.configure.generateDependencies.includes=**/emf-emf.b3aggrcon **/emf-transaction.b3aggrcon **/ep.b3aggrcon **/mdt-ocl.b3aggrcon **/mdt-uml2.b3aggrcon **/pdt.b3aggrcon **/birt.b3aggrcon **/emf-cdo.b3aggrcon **/emf-query.b3aggrcon **/emf-validation.b3aggrcon **/emft-emffacet.b3aggrcon **/m2t-acceleo.b3aggrcon **/mdt-uml2.b3aggrcon **/m2m-atl.b3aggrcon

+org.eclipse.emf.facet.releng.tycho.util.configure.generateDependencies.includes=**/emft-emffacet.b3aggrcon **/emf-emf.b3aggrcon **/emf-transaction.b3aggrcon **/ep.b3aggrcon **/mdt-ocl.b3aggrcon **/mdt-uml2.b3aggrcon **/pdt.b3aggrcon **/birt.b3aggrcon **/emf-cdo.b3aggrcon **/emf-query.b3aggrcon **/emf-validation.b3aggrcon **/m2t-acceleo.b3aggrcon **/mdt-uml2.b3aggrcon **/m2m-atl.b3aggrcon

 

 org.eclipse.emf.facet.releng.tycho.util.configure.pmdRuleSet=${product.source.location}/../org.eclipse.emf.facet.archi.tech.rules/pmd/ruleset.xml

 org.eclipse.emf.facet.releng.tycho.util.configure.checkstyleConfig=${product.source.location}/../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle

 org.eclipse.emf.facet.releng.tycho.util.configure.test.vmargs=-Xmx1024m -XX:MaxPermSize=256m

 

 org.eclipse.emf.facet.releng.tycho.util.configure.source.idRegex=org\\.eclipse.*modisco.*

-org.eclipse.emf.facet.releng.tycho.util.configure.doc.pattern=org\\.eclipse.*modisco.*

+org.eclipse.emf.facet.releng.tycho.util.configure.doc.pattern=org\\.eclipse(\\.gmt)?\\.modisco\\.((?!test|example).)*

 org.eclipse.emf.facet.releng.tycho.util.configure.statsURI=http://download.eclipse.org/stats

 

 org.eclipse.emf.facet.releng.tycho.util.configure.bugzillaProduct=MDT.MoDisco

diff --git a/org.eclipse.modisco.releng.tycho/releasetrain/simrel_git_clone.sh b/org.eclipse.modisco.releng.tycho/releasetrain/simrel_git_clone.sh
new file mode 100644
index 0000000..b39801c
--- /dev/null
+++ b/org.eclipse.modisco.releng.tycho/releasetrain/simrel_git_clone.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+# Copyright (c) 2015 Mia-Software.
+# 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:
+#    Grégoire Dupé - initial implementation
+
+function usage {
+	echo "Usage: $0 target_dir"
+}
+
+if [ -z $1 ] ; then
+	usage
+fi 
+
+git clone --branch Mars_maintenance http://git.eclipse.org/gitroot/simrel/org.eclipse.simrel.build.git $1
\ No newline at end of file
diff --git a/org.eclipse.modisco.sdk.doc/META-INF/MANIFEST.MF b/org.eclipse.modisco.sdk.doc/META-INF/MANIFEST.MF
index 91d2bd7..6bd86c6 100644
--- a/org.eclipse.modisco.sdk.doc/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.sdk.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %Bundle-Name

 Bundle-SymbolicName: org.eclipse.modisco.sdk.doc;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-Vendor: %Bundle-Vendor

 Require-Bundle: org.eclipse.core.runtime

 Bundle-ActivationPolicy: lazy

diff --git a/org.eclipse.modisco.sdk.feature/feature.xml b/org.eclipse.modisco.sdk.feature/feature.xml
index cd2d7cd..9a914da 100644
--- a/org.eclipse.modisco.sdk.feature/feature.xml
+++ b/org.eclipse.modisco.sdk.feature/feature.xml
@@ -12,7 +12,7 @@
 <feature

       id="org.eclipse.modisco.sdk.feature"

       label="MoDisco SDK (Incubation)"

-      version="0.12.2.qualifier"

+      version="0.13.2.qualifier"

       provider-name="%providerName"

       license-feature="org.eclipse.license"

       license-feature-version="0.0.0">

diff --git a/org.eclipse.modisco.smm.quality/META-INF/MANIFEST.MF b/org.eclipse.modisco.smm.quality/META-INF/MANIFEST.MF
index 9fb98f7..3920a39 100644
--- a/org.eclipse.modisco.smm.quality/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.smm.quality/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %pluginName

 Bundle-SymbolicName: org.eclipse.modisco.smm.quality;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-ClassPath: .

 Bundle-Vendor: %providerName

 Bundle-Localization: plugin

diff --git a/org.eclipse.modisco.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.tests/META-INF/MANIFEST.MF
index 6a2a94c..c7bec76 100644
--- a/org.eclipse.modisco.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.tests
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.modisco.infra.browser.custom.examples.uml.tests;bundle-version="0.8.0",
  org.eclipse.modisco.infra.browser.custom.tests;bundle-version="0.8.0",
@@ -38,7 +38,9 @@
  org.eclipse.gmt.modisco.kdm.uml2converter.tests;bundle-version="0.9.0",
  org.eclipse.gmt.modisco.xml.discoverer.tests;bundle-version="0.9.0",
  org.eclipse.pde.junit.runtime;bundle-version="3.4.100",
- org.eclipse.jdt.junit4.runtime;bundle-version="1.1.100"
+ org.eclipse.jdt.junit4.runtime;bundle-version="1.1.100",
+ org.eclipse.gmt.modisco.java.discoverer.benchmark.tests;bundle-version="0.13.1",
+ org.eclipse.modisco.java.discoverer.benchmark.tests;bundle-version="0.13.1"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %Bundle-Vendor
diff --git a/org.eclipse.modisco.tests/src/org/eclipse/modisco/tests/AllTests.java b/org.eclipse.modisco.tests/src/org/eclipse/modisco/tests/AllTests.java
index e1243d9..78b7fd4 100644
--- a/org.eclipse.modisco.tests/src/org/eclipse/modisco/tests/AllTests.java
+++ b/org.eclipse.modisco.tests/src/org/eclipse/modisco/tests/AllTests.java
@@ -25,12 +25,10 @@
 		org.eclipse.modisco.java.discoverer.tests.AllTestsInUIThread.class,

 		org.eclipse.gmt.modisco.java.discoverer.tests.AllTestsInUIThread.class,

 		org.eclipse.modisco.java.queries.tests.AllTestsInUIThread.class,

-/* disable benchmark tests because benchmark is disabled because Birt is disabled in Juno aggregation build

 		org.eclipse.modisco.java.discoverer.benchmark.tests.AllTestsInUIThread.class,

 		org.eclipse.gmt.modisco.java.discoverer.benchmark.tests.AllTestsInUIThread.class,

-*/

 //  see Bug 363302 - Disabled junit test java.discoverer.cdo.tests

-//		org.eclipse.modisco.java.discoverer.cdo.tests.AllTestsInUIThread.class,

+		org.eclipse.modisco.java.discoverer.cdo.tests.AllTestsInUIThread.class,

 //		org.eclipse.gmt.modisco.java.discoverer.cdo.tests.AllTestsInUIThread.class,

 		org.eclipse.modisco.infra.browser.custom.examples.java.jdk.tests.AllTestsInUIThread.class,

 		org.eclipse.modisco.java.browser.customization.test.AllTestsInUIThread.class,

diff --git a/org.eclipse.modisco.tests/src/org/eclipse/modisco/tests/BundleTest.java b/org.eclipse.modisco.tests/src/org/eclipse/modisco/tests/BundleTest.java
index d53c603..4cd4a3d 100644
--- a/org.eclipse.modisco.tests/src/org/eclipse/modisco/tests/BundleTest.java
+++ b/org.eclipse.modisco.tests/src/org/eclipse/modisco/tests/BundleTest.java
@@ -26,7 +26,7 @@
 

 	@Test

 	public void name() {

-		testManifestProperty("Bundle-Name", "MoDisco .*?\\(Incubation\\)"); //$NON-NLS-1$ //$NON-NLS-2$

+		testManifestProperty("Bundle-Name", "MoDisco .*?\\(Incubation\\)( Source){0,1}+"); //$NON-NLS-1$ //$NON-NLS-2$

 	}

 

 	@Test

@@ -36,7 +36,7 @@
 

 	@Test

 	public void version() {

-		testManifestProperty("Bundle-Version", "0\\.12\\.0\\..*"); //$NON-NLS-1$ //$NON-NLS-2$

+		testManifestProperty("Bundle-Version", "0\\.13\\.2\\..*"); //$NON-NLS-1$ //$NON-NLS-2$

 	}

 

 	@Test

@@ -92,4 +92,4 @@
 	private interface RunnableTest {

 		public void run(Bundle bundle);

 	}

-}
\ No newline at end of file
+}
diff --git a/org.eclipse.modisco.thirdparties.feature/feature.xml b/org.eclipse.modisco.thirdparties.feature/feature.xml
index eea8364..3dbc676 100644
--- a/org.eclipse.modisco.thirdparties.feature/feature.xml
+++ b/org.eclipse.modisco.thirdparties.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature

       id="org.eclipse.modisco.thirdparties"

       label="%featureName"

-      version="0.12.2.qualifier"

+      version="0.13.2.qualifier"

       provider-name="%providerName"

       license-feature="org.eclipse.license"

       license-feature-version="0.0.0">

diff --git a/org.eclipse.modisco.updatesite/site.xml b/org.eclipse.modisco.updatesite/site.xml
index 273df2a..cc0d042 100644
--- a/org.eclipse.modisco.updatesite/site.xml
+++ b/org.eclipse.modisco.updatesite/site.xml
@@ -1,47 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <site>

-   <feature url="features/org.eclipse.modisco.examples.feature_0.12.2.qualifier.jar" id="org.eclipse.modisco.examples.feature" version="0.12.2.qualifier">

+   <feature url="features/org.eclipse.modisco.examples.feature_0.13.2.qualifier.jar" id="org.eclipse.modisco.examples.feature" version="0.13.2.qualifier">

       <category name="org.eclipse.modisco.updatesite.dev"/>

    </feature>

-   <feature url="features/org.eclipse.modisco.infra.cdo.derby.feature_0.12.2.qualifier.jar" id="org.eclipse.modisco.infra.cdo.derby.feature" version="0.12.2.qualifier">

+   <feature url="features/org.eclipse.modisco.infra.cdo.derby.feature_0.13.2.qualifier.jar" id="org.eclipse.modisco.infra.cdo.derby.feature" version="0.13.2.qualifier">

       <category name="org.eclipse.modisco.updatesite.cdo"/>

    </feature>

-   <feature url="features/org.eclipse.modisco.infra.omg.feature_0.12.2.qualifier.jar" id="org.eclipse.modisco.infra.omg.feature" version="0.12.2.qualifier">

+   <feature url="features/org.eclipse.modisco.infra.omg.feature_0.13.2.qualifier.jar" id="org.eclipse.modisco.infra.omg.feature" version="0.13.2.qualifier">

       <category name="org.eclipse.modisco.updatesite.infrastructure"/>

    </feature>

-   <feature url="features/org.eclipse.modisco.infrastructure.feature_0.12.2.qualifier.jar" id="org.eclipse.modisco.infrastructure.feature" version="0.12.2.qualifier">

+   <feature url="features/org.eclipse.modisco.infrastructure.feature_0.13.2.qualifier.jar" id="org.eclipse.modisco.infrastructure.feature" version="0.13.2.qualifier">

       <category name="org.eclipse.modisco.updatesite.infrastructure"/>

    </feature>

-   <feature url="features/org.eclipse.modisco.java.cdo.feature_0.12.2.qualifier.jar" id="org.eclipse.modisco.java.cdo.feature" version="0.12.2.qualifier">

+   <feature url="features/org.eclipse.modisco.java.cdo.feature_0.13.2.qualifier.jar" id="org.eclipse.modisco.java.cdo.feature" version="0.13.2.qualifier">

       <category name="org.eclipse.modisco.updatesite.cdo"/>

    </feature>

-   <feature url="features/org.eclipse.modisco.java.feature_0.12.2.qualifier.jar" id="org.eclipse.modisco.java.feature" version="0.12.2.qualifier">

+   <feature url="features/org.eclipse.modisco.java.feature_0.13.2.qualifier.jar" id="org.eclipse.modisco.java.feature" version="0.13.2.qualifier">

       <category name="org.eclipse.modisco.updatesite.technologies"/>

    </feature>

-   <feature url="features/org.eclipse.modisco.jee.feature_0.12.2.qualifier.jar" id="org.eclipse.modisco.jee.feature" version="0.12.2.qualifier">

+   <feature url="features/org.eclipse.modisco.jee.feature_0.13.2.qualifier.jar" id="org.eclipse.modisco.jee.feature" version="0.13.2.qualifier">

       <category name="org.eclipse.modisco.updatesite.technologies"/>

    </feature>

-   <feature url="features/org.eclipse.modisco.sdk.feature_0.12.2.qualifier.jar" id="org.eclipse.modisco.sdk.feature" version="0.12.2.qualifier">

+   <feature url="features/org.eclipse.modisco.sdk.feature_0.13.2.qualifier.jar" id="org.eclipse.modisco.sdk.feature" version="0.13.2.qualifier">

       <category name="org.eclipse.modisco.updatesite.main"/>

    </feature>

-   <feature url="features/org.eclipse.modisco.usecase.modelfilter.feature_0.12.2.qualifier.jar" id="org.eclipse.modisco.usecase.modelfilter.feature" version="0.12.2.qualifier">

+   <feature url="features/org.eclipse.modisco.usecase.modelfilter.feature_0.13.2.qualifier.jar" id="org.eclipse.modisco.usecase.modelfilter.feature" version="0.13.2.qualifier">

       <category name="org.eclipse.modisco.updatesite.usecases"/>

    </feature>

-   <feature url="features/org.eclipse.modisco.usecase.simpletransformationschain.feature_0.12.2.qualifier.jar" id="org.eclipse.modisco.usecase.simpletransformationschain.feature" version="0.12.2.qualifier">

+   <feature url="features/org.eclipse.modisco.usecase.simpletransformationschain.feature_0.13.2.qualifier.jar" id="org.eclipse.modisco.usecase.simpletransformationschain.feature" version="0.13.2.qualifier">

       <category name="org.eclipse.modisco.updatesite.usecases"/>

    </feature>

-   <feature url="features/org.eclipse.modisco.xml.feature_0.12.2.qualifier.jar" id="org.eclipse.modisco.xml.feature" version="0.12.2.qualifier">

+   <feature url="features/org.eclipse.modisco.xml.feature_0.13.2.qualifier.jar" id="org.eclipse.modisco.xml.feature" version="0.13.2.qualifier">

       <category name="org.eclipse.modisco.updatesite.technologies"/>

    </feature>

-   <feature url="features/org.eclipse.modisco.infra.discovery.benchmark.feature_0.12.2.qualifier.jar" id="org.eclipse.modisco.infra.discovery.benchmark.feature" version="0.12.2.qualifier">

+   <feature url="features/org.eclipse.modisco.infra.discovery.benchmark.feature_0.13.2.qualifier.jar" id="org.eclipse.modisco.infra.discovery.benchmark.feature" version="0.13.2.qualifier">

       <category name="org.eclipse.modisco.updatesite.dev"/>

    </feature>

-   <feature url="features/org.eclipse.modisco.all.feature_0.12.2.qualifier.jar" id="org.eclipse.modisco.all.feature" version="0.12.2.qualifier">

+   <feature url="features/org.eclipse.modisco.all.feature_0.13.2.qualifier.jar" id="org.eclipse.modisco.all.feature" version="0.13.2.qualifier">

       <category name="org.eclipse.modisco.updatesite.dev"/>

    </feature>

-   <feature url="features/org.eclipse.modisco.thirdparties_0.12.2.qualifier.jar" id="org.eclipse.modisco.thirdparties" version="0.12.2.qualifier">

+   <feature url="features/org.eclipse.modisco.thirdparties_0.13.2.qualifier.jar" id="org.eclipse.modisco.thirdparties" version="0.13.2.qualifier">

       <category name="org.eclipse.modisco.updatesite.dev"/>

    </feature>

+   <feature url="features/org.eclipse.modisco.infra.browser.feature_0.13.2.qualifier.jar" id="org.eclipse.modisco.infra.browser.feature" version="0.13.2.qualifier">

+      <category name="org.eclipse.modisco.updatesite.infrastructure"/>

+   </feature>

    <category-def name="org.eclipse.modisco.updatesite.infrastructure" label="Infrastrucutre"/>

    <category-def name="org.eclipse.modisco.updatesite.technologies" label="Technologies"/>

    <category-def name="org.eclipse.modisco.updatesite.cdo" label="CDO Adapters"/>

diff --git a/org.eclipse.modisco.usecase.java.samplemetrics/META-INF/MANIFEST.MF b/org.eclipse.modisco.usecase.java.samplemetrics/META-INF/MANIFEST.MF
index d9d52c6..cf38ec2 100644
--- a/org.eclipse.modisco.usecase.java.samplemetrics/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.usecase.java.samplemetrics/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.usecase.java.samplemetrics;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.gmt.modisco.infra.common.core,
  org.eclipse.gmt.modisco.infra.query.core
diff --git a/org.eclipse.modisco.usecase.java.samplerefactoring/META-INF/MANIFEST.MF b/org.eclipse.modisco.usecase.java.samplerefactoring/META-INF/MANIFEST.MF
index 96f438c..717848f 100644
--- a/org.eclipse.modisco.usecase.java.samplerefactoring/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.usecase.java.samplerefactoring/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.usecase.java.samplerefactoring;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.gmt.modisco.infra.common.core,
  org.eclipse.gmt.modisco.infra.query.core
diff --git a/org.eclipse.modisco.usecase.modelfilter.dependencies.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.usecase.modelfilter.dependencies.ui/META-INF/MANIFEST.MF
index bd7ee24..30776bc 100644
--- a/org.eclipse.modisco.usecase.modelfilter.dependencies.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.usecase.modelfilter.dependencies.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.usecase.modelfilter.dependencies.ui;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.usecase.modelfilter.dependencies.ui.internal.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.usecase.modelfilter.doc/META-INF/MANIFEST.MF b/org.eclipse.modisco.usecase.modelfilter.doc/META-INF/MANIFEST.MF
index 7b19147..ccb7f17 100644
--- a/org.eclipse.modisco.usecase.modelfilter.doc/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.usecase.modelfilter.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %Bundle-Name

 Bundle-SymbolicName: org.eclipse.modisco.usecase.modelfilter.doc;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-Vendor: %Bundle-Vendor

 Require-Bundle: org.eclipse.core.runtime

 Bundle-ActivationPolicy: lazy

diff --git a/org.eclipse.modisco.usecase.modelfilter.feature/feature.xml b/org.eclipse.modisco.usecase.modelfilter.feature/feature.xml
index 037303d..7b7d442 100644
--- a/org.eclipse.modisco.usecase.modelfilter.feature/feature.xml
+++ b/org.eclipse.modisco.usecase.modelfilter.feature/feature.xml
@@ -12,7 +12,7 @@
 <feature

       id="org.eclipse.modisco.usecase.modelfilter.feature"

       label="MoDisco Model Filter (Incubation)"

-      version="0.12.2.qualifier"

+      version="0.13.2.qualifier"

       provider-name="%providerName"

       license-feature="org.eclipse.license"

       license-feature-version="0.0.0">

diff --git a/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui/META-INF/MANIFEST.MF
index d3897af..5d53c2b 100644
--- a/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui.internal.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer/META-INF/MANIFEST.MF b/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer/META-INF/MANIFEST.MF
index cdd68ea..3525d56 100644
--- a/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.internal.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.usecase.modelfilter.methodcalls/META-INF/MANIFEST.MF b/org.eclipse.modisco.usecase.modelfilter.methodcalls/META-INF/MANIFEST.MF
index 956c653..5a40122 100644
--- a/org.eclipse.modisco.usecase.modelfilter.methodcalls/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.usecase.modelfilter.methodcalls/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.usecase.modelfilter.methodcalls;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.gmt.modisco.java;bundle-version="0.9.0",
diff --git a/org.eclipse.modisco.usecase.modelfilter.tests/.checkstyle b/org.eclipse.modisco.usecase.modelfilter.tests/.checkstyle
new file mode 100644
index 0000000..d18c658
--- /dev/null
+++ b/org.eclipse.modisco.usecase.modelfilter.tests/.checkstyle
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
+  <local-check-config name="EmfFacet" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <fileset name="all" enabled="true" check-config-name="EmfFacet" local="true">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+    <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
+  </fileset>
+</fileset-config>
diff --git a/org.eclipse.modisco.usecase.modelfilter.tests/.pmd b/org.eclipse.modisco.usecase.modelfilter.tests/.pmd
new file mode 100644
index 0000000..429c20e
--- /dev/null
+++ b/org.eclipse.modisco.usecase.modelfilter.tests/.pmd
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<pmd>

+   <useProjectRuleSet>true</useProjectRuleSet>

+   <ruleSetFile>../org.eclipse.emf.facet.archi.tech.rules/pmd/ruleset.xml</ruleSetFile>

+   <includeDerivedFiles>false</includeDerivedFiles>

+   <violationsAsErrors>true</violationsAsErrors>

+</pmd>
\ No newline at end of file
diff --git a/org.eclipse.modisco.usecase.modelfilter.tests/.project b/org.eclipse.modisco.usecase.modelfilter.tests/.project
index a7cc702..94ea1a8 100644
--- a/org.eclipse.modisco.usecase.modelfilter.tests/.project
+++ b/org.eclipse.modisco.usecase.modelfilter.tests/.project
@@ -20,9 +20,21 @@
 			<arguments>

 			</arguments>

 		</buildCommand>

+		<buildCommand>

+			<name>net.sourceforge.pmd.eclipse.plugin.pmdBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

 	</buildSpec>

 	<natures>

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

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

+		<nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature>

+		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>

 	</natures>

 </projectDescription>

diff --git a/org.eclipse.modisco.usecase.modelfilter.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.usecase.modelfilter.tests/META-INF/MANIFEST.MF
index bf2f0b0..224fce4 100644
--- a/org.eclipse.modisco.usecase.modelfilter.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.usecase.modelfilter.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.usecase.modelfilter.tests;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.usecase.modelfilter.tests.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.usecase.modelfilter.tests/src/org/eclipse/modisco/usecase/modelfilter/tests/SimpleBlackBoxDiscovery.java b/org.eclipse.modisco.usecase.modelfilter.tests/src/org/eclipse/modisco/usecase/modelfilter/tests/SimpleBlackBoxDiscovery.java
index a5224ce..a534cf8 100644
--- a/org.eclipse.modisco.usecase.modelfilter.tests/src/org/eclipse/modisco/usecase/modelfilter/tests/SimpleBlackBoxDiscovery.java
+++ b/org.eclipse.modisco.usecase.modelfilter.tests/src/org/eclipse/modisco/usecase/modelfilter/tests/SimpleBlackBoxDiscovery.java
@@ -1,5 +1,5 @@
 /*

- * Copyright (c) 2010 Mia-Software.

+ * Copyright (c) 2010, 2015  Mia-Software.

  * 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

@@ -7,15 +7,18 @@
  *

  * Contributors:

  *    Gabriel Barbier (Mia-Software) - initial API and implementation

+ *    Grégoire Dupé (Mia-Software) - Bug 468346 - [Unit Test Failure] org.eclipse.modisco.usecase.modelfilter.tests.SimpleBlackBoxDiscovery.testUmlModelFromJavaProjectWithReferenceModel

  */

 

 package org.eclipse.modisco.usecase.modelfilter.tests;

 

+import java.io.IOException;

 import java.net.URL;

 import java.util.HashMap;

 import java.util.List;

 import java.util.Map;

 

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

 import org.eclipse.emf.common.util.BasicDiagnostic;

 import org.eclipse.emf.common.util.Diagnostic;

 import org.eclipse.emf.common.util.DiagnosticChain;

@@ -31,6 +34,7 @@
 import org.junit.After;

 import org.junit.Assert;

 import org.junit.Before;

+import org.junit.Ignore;

 import org.junit.Test;

 

 /**

@@ -67,85 +71,78 @@
 	}

 

 	@Test

-	public void testUmlModelDiscoveryFromJavaProject() {

+	public void testUmlModelDiscoveryFromJavaProject() throws CoreException,

+			IOException {

 		Assert.assertNotNull(this.javaProjectFactory);

+		IJavaProject javaProject = this.javaProjectFactory.getJavaProject();

+		Assert.assertNotNull(javaProject);

 

-		try {

+		String sourceFolderPath = this.rootSourcesPath + this.projectName

+				+ "/src"; //$NON-NLS-1$

+		URL src = Activator.getDefault().getBundle()

+				.getEntry(sourceFolderPath);

+		Assert.assertNotNull(src);

+		this.javaProjectFactory.populateSourceFolder(sourceFolderPath);

 

-			IJavaProject javaProject = this.javaProjectFactory.getJavaProject();

-			Assert.assertNotNull(javaProject);

+		DiscoverUmlModelWithRealTypesFromJavaProject discoverer = new DiscoverUmlModelWithRealTypesFromJavaProject();

+		Assert.assertNotNull(discoverer);

+		Map<DiscoveryParameter, Object> parameters = new HashMap<DiscoveryParameter, Object>();

+		parameters.put(discoverer.getSilentModeParameter(), Boolean.TRUE);

+		discoverer.discoverElement(javaProject, parameters);

+		Resource output = (Resource) parameters.get(discoverer

+				.getTargetModelParameter());

+		Assert.assertNotNull(output);

 

-			String sourceFolderPath = this.rootSourcesPath + this.projectName

-					+ "/src"; //$NON-NLS-1$

-			URL src = Activator.getDefault().getBundle()

-					.getEntry(sourceFolderPath);

-			Assert.assertNotNull(src);

-			this.javaProjectFactory.populateSourceFolder(sourceFolderPath);

-

-			DiscoverUmlModelWithRealTypesFromJavaProject discoverer = new DiscoverUmlModelWithRealTypesFromJavaProject();

-			Assert.assertNotNull(discoverer);

-			Map<DiscoveryParameter, Object> parameters = new HashMap<DiscoveryParameter, Object>();

-			parameters.put(discoverer.getSilentModeParameter(), Boolean.TRUE);

-			discoverer.discoverElement(javaProject, parameters);

-			Resource output = (Resource) parameters.get(discoverer

-					.getTargetModelParameter());

-			Assert.assertNotNull(output);

-

-			if (this.export) {

-				output.setURI(URI

-						.createFileURI("c:/referenceModel" + this.umlModelExtension)); //$NON-NLS-1$

-				output.save(null);

-			}

-		} catch (Exception e) {

-			Assert.fail(e.getMessage());

+		if (this.export) {

+			output.setURI(URI

+					.createFileURI("c:/referenceModel" + this.umlModelExtension)); //$NON-NLS-1$

+			output.save(null);

 		}

 	}

 

+	@Ignore //cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=468346

 	@Test

-	public void testUmlModelFromJavaProjectWithReferenceModel() {

+	public void testUmlModelFromJavaProjectWithReferenceModel()

+			throws CoreException, IOException, InterruptedException {

 		Assert.assertNotNull(this.javaProjectFactory);

-		try {

-			IJavaProject javaProject = this.javaProjectFactory.getJavaProject();

-			Assert.assertNotNull(javaProject);

+		IJavaProject javaProject = this.javaProjectFactory.getJavaProject();

+		Assert.assertNotNull(javaProject);

 

-			String sourceFolderPath = this.rootSourcesPath + this.projectName

-					+ "/src"; //$NON-NLS-1$

-			URL src = Activator.getDefault().getBundle()

-					.getEntry(sourceFolderPath);

-			Assert.assertNotNull(src);

-			this.javaProjectFactory.populateSourceFolder(sourceFolderPath);

+		String sourceFolderPath = this.rootSourcesPath + this.projectName

+				+ "/src"; //$NON-NLS-1$

+		URL src = Activator.getDefault().getBundle()

+				.getEntry(sourceFolderPath);

+		Assert.assertNotNull(src);

+		this.javaProjectFactory.populateSourceFolder(sourceFolderPath);

 

-			DiscoverUmlModelWithRealTypesFromJavaProject discoverer = new DiscoverUmlModelWithRealTypesFromJavaProject();

-			Assert.assertNotNull(discoverer);

-			Map<DiscoveryParameter, Object> parameters = new HashMap<DiscoveryParameter, Object>();

-			parameters.put(discoverer.getSilentModeParameter(), Boolean.TRUE);

-			discoverer.discoverElement(javaProject, parameters);

-			Resource output = (Resource) parameters.get(discoverer

-					.getTargetModelParameter());

-			Assert.assertNotNull(output);

+		DiscoverUmlModelWithRealTypesFromJavaProject discoverer = new DiscoverUmlModelWithRealTypesFromJavaProject();

+		Assert.assertNotNull(discoverer);

+		Map<DiscoveryParameter, Object> parameters = new HashMap<DiscoveryParameter, Object>();

+		parameters.put(discoverer.getSilentModeParameter(), Boolean.TRUE);

+		discoverer.discoverElement(javaProject, parameters);

+		Resource output = (Resource) parameters.get(discoverer

+				.getTargetModelParameter());

+		Assert.assertNotNull(output);

 

-			/*

-			 * Because everything looks great, well we have to test model

-			 * content. In details we will compare current resource with a

-			 * reference (checked manually)

-			 * 

-			 * Warning, because the java model store the "filepath" of

-			 * discovered java code, the compilation units elements could not be

-			 * the same !!!!

-			 */

-			String referencePath = "/" + Activator.PLUGIN_ID + this.referencesFolderPath + this.projectName //$NON-NLS-1$ 

-					+ "RealTypes" + this.umlModelExtension; //$NON-NLS-1$

-			URI referenceUri = URI.createPlatformPluginURI(referencePath, true);

-			Assert.assertNotNull(referenceUri);

-			Resource referenceModel = ModelUtils.loadModel(referenceUri);

-			Assert.assertNotNull(referenceModel);

-			boolean result = TestModelUtils.compareModels(output,

-					referenceModel, true);

-			Assert.assertTrue(

-					"Comparison of Uml models with real types has failed !", result); //$NON-NLS-1$

-		} catch (Exception e) {

-			Assert.fail(e.getMessage());

-		}

+		/*

+		 * Because everything looks great, well we have to test model

+		 * content. In details we will compare current resource with a

+		 * reference (checked manually)

+		 * 

+		 * Warning, because the java model store the "filepath" of

+		 * discovered java code, the compilation units elements could not be

+		 * the same !!!!

+		 */

+		String referencePath = "/" + Activator.PLUGIN_ID + this.referencesFolderPath + this.projectName //$NON-NLS-1$ 

+				+ "RealTypes" + this.umlModelExtension; //$NON-NLS-1$

+		URI referenceUri = URI.createPlatformPluginURI(referencePath, true);

+		Assert.assertNotNull(referenceUri);

+		Resource referenceModel = ModelUtils.loadModel(referenceUri);

+		Assert.assertNotNull(referenceModel);

+		boolean result = TestModelUtils.compareModels(output,

+				referenceModel, true);

+		Assert.assertTrue(

+				"Comparison of Uml models with real types has failed !", result); //$NON-NLS-1$

 	}

 

 	@Test

diff --git a/org.eclipse.modisco.usecase.modelfilter.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.usecase.modelfilter.ui/META-INF/MANIFEST.MF
index d40229e..7316ae7 100644
--- a/org.eclipse.modisco.usecase.modelfilter.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.usecase.modelfilter.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.usecase.modelfilter.ui;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.usecase.modelfilter.ui.internal.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.modisco.usecase.modelfilter/META-INF/MANIFEST.MF b/org.eclipse.modisco.usecase.modelfilter/META-INF/MANIFEST.MF
index 8d52937..649e41b 100644
--- a/org.eclipse.modisco.usecase.modelfilter/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.usecase.modelfilter/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0

 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.modisco.usecase.modelfilter;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-Activator: org.eclipse.modisco.usecase.modelfilter.internal.Activator

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

  org.eclipse.m2m.atl.engine;bundle-version="3.0.0",

diff --git a/org.eclipse.modisco.usecase.simpletransformationchain.doc/META-INF/MANIFEST.MF b/org.eclipse.modisco.usecase.simpletransformationchain.doc/META-INF/MANIFEST.MF
index 5da526e..8aab565 100644
--- a/org.eclipse.modisco.usecase.simpletransformationchain.doc/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.usecase.simpletransformationchain.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %Bundle-Name

 Bundle-SymbolicName: org.eclipse.modisco.usecase.simpletransformationchain.doc;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-Vendor: %Bundle-Vendor

 Require-Bundle: org.eclipse.core.runtime

 Bundle-ActivationPolicy: lazy

diff --git a/org.eclipse.modisco.usecase.simpletransformationschain.feature/feature.xml b/org.eclipse.modisco.usecase.simpletransformationschain.feature/feature.xml
index ebdc5cf..df58f1c 100644
--- a/org.eclipse.modisco.usecase.simpletransformationschain.feature/feature.xml
+++ b/org.eclipse.modisco.usecase.simpletransformationschain.feature/feature.xml
@@ -12,7 +12,7 @@
 <feature

       id="org.eclipse.modisco.usecase.simpletransformationschain.feature"

       label="MoDisco Simple transformations chain (Incubation)"

-      version="0.12.2.qualifier"

+      version="0.13.2.qualifier"

       provider-name="%providerName"

       license-feature="org.eclipse.license"

       license-feature-version="0.0.0">

diff --git a/org.eclipse.modisco.usecase.simpletransformationschain.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.usecase.simpletransformationschain.ui/META-INF/MANIFEST.MF
index ee39fe8..d1c33f6 100644
--- a/org.eclipse.modisco.usecase.simpletransformationschain.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.usecase.simpletransformationschain.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.usecase.simpletransformationschain.ui;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.usecase.simpletransformationschain.ui.internal.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.modisco.usecase.simpletransformationschain/META-INF/MANIFEST.MF b/org.eclipse.modisco.usecase.simpletransformationschain/META-INF/MANIFEST.MF
index 2d832a9..a876a31 100644
--- a/org.eclipse.modisco.usecase.simpletransformationschain/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.usecase.simpletransformationschain/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.modisco.usecase.simpletransformationschain;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.usecase.simpletransformationschain.internal.Activator
 Require-Bundle: org.eclipse.core.resources,
  org.eclipse.jdt.core,
diff --git a/org.eclipse.modisco.util.atl.core/META-INF/MANIFEST.MF b/org.eclipse.modisco.util.atl.core/META-INF/MANIFEST.MF
index e44ab10..ce6f5f7 100644
--- a/org.eclipse.modisco.util.atl.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.util.atl.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.util.atl.core
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.util.atl.core.internal.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.utils.chart.birt.core.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.utils.chart.birt.core.tests/META-INF/MANIFEST.MF
index 9cc813c..771269b 100644
--- a/org.eclipse.modisco.utils.chart.birt.core.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.utils.chart.birt.core.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.utils.chart.birt.core.tests
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.utils.chart.birt.core.tests.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.utils.chart.birt.core/META-INF/MANIFEST.MF b/org.eclipse.modisco.utils.chart.birt.core/META-INF/MANIFEST.MF
index 43fe213..565be9d 100644
--- a/org.eclipse.modisco.utils.chart.birt.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.utils.chart.birt.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.utils.chart.birt.core
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.utils.chart.birt.core.internal.Activator
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.birt.chart.engine;bundle-version="2.6.0",
diff --git a/org.eclipse.modisco.utils.chart.feature/feature.xml b/org.eclipse.modisco.utils.chart.feature/feature.xml
index 5a7615b..5e2501a 100644
--- a/org.eclipse.modisco.utils.chart.feature/feature.xml
+++ b/org.eclipse.modisco.utils.chart.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature

       id="org.eclipse.modisco.utils.chart.feature"

       label="MoDisco Chart Utilities (Incubation)"

-      version="0.12.2.qualifier"

+      version="0.13.2.qualifier"

       provider-name="%providerName"

       license-feature="org.eclipse.license"

       license-feature-version="0.0.0">

diff --git a/org.eclipse.modisco.utils.chart.metamodel/META-INF/MANIFEST.MF b/org.eclipse.modisco.utils.chart.metamodel/META-INF/MANIFEST.MF
index 2345adf..85105ee 100644
--- a/org.eclipse.modisco.utils.chart.metamodel/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.utils.chart.metamodel/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.utils.chart.metamodel;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
diff --git a/org.eclipse.modisco.utils.core/META-INF/MANIFEST.MF b/org.eclipse.modisco.utils.core/META-INF/MANIFEST.MF
index 545b62c..074062b 100644
--- a/org.eclipse.modisco.utils.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.utils.core/META-INF/MANIFEST.MF
@@ -2,9 +2,10 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.utils.core
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.utils.core.internal.Activator
-Require-Bundle: org.eclipse.core.runtime
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.emf.facet.util.core;bundle-version="1.0.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.modisco.utils.core.internal.exported
diff --git a/org.eclipse.modisco.utils.core/src/org/eclipse/modisco/utils/core/internal/Activator.java b/org.eclipse.modisco.utils.core/src/org/eclipse/modisco/utils/core/internal/Activator.java
index 023d1a3..f4c86b5 100644
--- a/org.eclipse.modisco.utils.core/src/org/eclipse/modisco/utils/core/internal/Activator.java
+++ b/org.eclipse.modisco.utils.core/src/org/eclipse/modisco/utils/core/internal/Activator.java
@@ -1,44 +1,51 @@
 /*******************************************************************************

- * Copyright (c) 2012 INRIA. 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

+ * Copyright (c) 2012, 2015 INRIA and Mia-Software.

+ * 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: Guillaume Doux - INRIA - Initial API and implementation

- * 

+ * Contributors:

+ *    Guillaume Doux - INRIA - Initial API and implementation

+ *    Grégoire Dupé (Mia-Software) - Bug 482715 - NumberFormatException in SystemInfo.computeInfo (180)

  ******************************************************************************/

 package org.eclipse.modisco.utils.core.internal;

 

-import org.osgi.framework.BundleActivator;

+import org.eclipse.core.runtime.Plugin;

 import org.osgi.framework.BundleContext;

 

-/**

- * 

- * @author Guillaume Doux

- *

- */

-public class Activator implements BundleActivator {

+@SuppressWarnings("PMD.UseSingleton")

+// @SuppressWarnings("PMD.UseSingleton") We cannot conforms to this rule because

+// this class is an Eclipse plug-in activator which will be instantiated by the

+// Eclipse framework.

+public class Activator extends Plugin {

 

-	private static BundleContext context;

+	private static Activator plugin;

 

-	static BundleContext getContext() {

-		return context;

+	@Override

+	@SuppressWarnings("PMD.SignatureDeclareThrowsException")

+	// @SuppressWarnings("PMD.SignatureDeclareThrowsException") We have to use

+	// this signature because this is an override of an Eclipse framework's

+	// method.

+	public void start(final BundleContext bundleContext) throws Exception {

+		super.start(bundleContext);

+		Activator.plugin = this;

 	}

 

-	/*

-	 * (non-Javadoc)

-	 * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)

-	 */

-	public void start(BundleContext bundleContext) throws Exception {

-		Activator.context = bundleContext;

+	@Override

+	@SuppressWarnings("PMD.SignatureDeclareThrowsException")

+	// @SuppressWarnings("PMD.SignatureDeclareThrowsException") We have to use

+	// this signature because this is an override of an Eclipse framework's

+	// method.

+	public void stop(final BundleContext bundleContext) throws Exception {

+		// NOPMD: PMD say "Assigning an Object to null is a code smell."

+		// No choice to right it in another way : this is an Eclipse pattern.

+		Activator.plugin = null; // NOPMD by gdupe on 30/03/12 10:19

+		super.stop(bundleContext);

 	}

 

-	/*

-	 * (non-Javadoc)

-	 * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)

-	 */

-	public void stop(BundleContext bundleContext) throws Exception {

-		Activator.context = null;

+	public static Plugin getDefault() {

+		return Activator.plugin;

 	}

 

 }

diff --git a/org.eclipse.modisco.utils.core/src/org/eclipse/modisco/utils/core/internal/exported/SystemInfo.java b/org.eclipse.modisco.utils.core/src/org/eclipse/modisco/utils/core/internal/exported/SystemInfo.java
index 101c6a0..0bd4f17 100644
--- a/org.eclipse.modisco.utils.core/src/org/eclipse/modisco/utils/core/internal/exported/SystemInfo.java
+++ b/org.eclipse.modisco.utils.core/src/org/eclipse/modisco/utils/core/internal/exported/SystemInfo.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2011 Mia-Software.

+ * Copyright (c) 2011, 2015 Mia-Software, and INRIA.

  * 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

@@ -7,7 +7,8 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

- *    Guillaume Doux (INRIA) -  refactoring and move to a separate plug-in

+ *    Guillaume Doux (INRIA) - refactoring and move to a separate plug-in

+ *    Grégoire Dupé (Mia-Software) - Bug 482715 - NumberFormatException in SystemInfo.computeInfo (180)

  *******************************************************************************/

 package org.eclipse.modisco.utils.core.internal.exported;

 

@@ -27,6 +28,9 @@
 import java.util.regex.Matcher;

 import java.util.regex.Pattern;

 

+import org.eclipse.emf.facet.util.core.Logger;

+import org.eclipse.modisco.utils.core.internal.Activator;

+

 /**

  * Class providing information about the system that are not provided internally by JAVA

  *

@@ -177,7 +181,11 @@
 			List<String> infos = getInfos("Capacity", result); //$NON-NLS-1$

 			long mem = 0;

 			for (String info : infos) {

-				mem += Long.parseLong(info);

+				try {

+					mem += Long.parseLong(info);

+				} catch (NumberFormatException e) {

+					Logger.logWarning(e, Activator.getDefault());

+				}

 			}

 			this.memory = "" + mem; //$NON-NLS-1$

 		} else {

diff --git a/org.eclipse.modisco.workflow.core/META-INF/MANIFEST.MF b/org.eclipse.modisco.workflow.core/META-INF/MANIFEST.MF
index e88cd06..a6c2e52 100644
--- a/org.eclipse.modisco.workflow.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.workflow.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.workflow.core;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.workflow.core.internal.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.workflow.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.workflow.ui/META-INF/MANIFEST.MF
index 0a5e24f..20e4fd6 100644
--- a/org.eclipse.modisco.workflow.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.workflow.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.workflow.ui;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.workflow.ui.internal.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.modisco.workflow/META-INF/MANIFEST.MF b/org.eclipse.modisco.workflow/META-INF/MANIFEST.MF
index fcde5c9..1750fce 100644
--- a/org.eclipse.modisco.workflow/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.workflow/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.workflow;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.modisco.xml.discoverer.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.xml.discoverer.tests/META-INF/MANIFEST.MF
index b715c6a..2ebbdf7 100644
--- a/org.eclipse.modisco.xml.discoverer.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.xml.discoverer.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.xml.discoverer.tests
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.xml.discoverer.tests.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.modisco.xml.discoverer.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.xml.discoverer.ui/META-INF/MANIFEST.MF
index 8fb1df3..9aa0907 100644
--- a/org.eclipse.modisco.xml.discoverer.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.xml.discoverer.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.modisco.xml.discoverer.ui;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.xml.discoverer.ui.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.modisco.xml.discoverer/META-INF/MANIFEST.MF b/org.eclipse.modisco.xml.discoverer/META-INF/MANIFEST.MF
index beba7df..4fcd1e2 100644
--- a/org.eclipse.modisco.xml.discoverer/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.xml.discoverer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.modisco.xml.discoverer;singleton:=true
-Bundle-Version: 0.12.2.qualifier
+Bundle-Version: 0.13.2.qualifier
 Bundle-Activator: org.eclipse.modisco.xml.discoverer.internal.XmlActivator
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.xml.doc/META-INF/MANIFEST.MF b/org.eclipse.modisco.xml.doc/META-INF/MANIFEST.MF
index 969f0e6..fd42e1f 100644
--- a/org.eclipse.modisco.xml.doc/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.xml.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: %Bundle-Name

 Bundle-SymbolicName: org.eclipse.modisco.xml.doc;singleton:=true

-Bundle-Version: 0.12.2.qualifier

+Bundle-Version: 0.13.2.qualifier

 Bundle-Vendor: %Bundle-Vendor

 Require-Bundle: org.eclipse.core.runtime

 Bundle-ActivationPolicy: lazy

diff --git a/org.eclipse.modisco.xml.feature/feature.xml b/org.eclipse.modisco.xml.feature/feature.xml
index 266a6e3..239804e 100644
--- a/org.eclipse.modisco.xml.feature/feature.xml
+++ b/org.eclipse.modisco.xml.feature/feature.xml
@@ -12,7 +12,7 @@
 <feature

       id="org.eclipse.modisco.xml.feature"

       label="MoDisco Xml Feature (Incubation)"

-      version="0.12.2.qualifier"

+      version="0.13.2.qualifier"

       provider-name="%providerName"

       plugin="org.eclipse.gmt.modisco.xml"

       license-feature="org.eclipse.license"