Contribute the first version of the build for EEF NG

1) A build has been contributed for all the org.eclipse.eef.* projects
2) All the plugins that will not be used now have been moved to the
prototypes directory.

Change-Id: I4477be42b519df975a426fb8016ea5b5276cc729
Signed-off-by: Stéphane Bégaudeau <stephane.begaudeau@obeo.fr>

10 files changed, 38 insertions, 358 deletions

diff --git a/doc/org.eclipse.eef.documentation/META-INF/MANIFEST.MF b/doc/org.eclipse.eef.documentation/META-INF/MANIFEST.MF
index 4f4bc13b0..95decaf5c 100644
--- a/doc/org.eclipse.eef.documentation/META-INF/MANIFEST.MF
+++ b/doc/org.eclipse.eef.documentation/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.eef.documentation
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/doc/org.eclipse.eef.documentation/pom.xml b/doc/org.eclipse.eef.documentation/pom.xml
new file mode 100644
index 000000000..955a3be73
--- /dev/null
+++ b/doc/org.eclipse.eef.documentation/pom.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+Copyright (c) 2015 Obeo.
+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:
+    Obeo - initial API and implementation
+-->
+<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">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.eclipse.eef</groupId>
+    <artifactId>org.eclipse.eef.parent</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+    <relativePath>../../releng/org.eclipse.eef.releng</relativePath>
+  </parent>
+
+  <artifactId>org.eclipse.eef.documentation</artifactId>
+  <packaging>eclipse-plugin</packaging>
+  
+  <name>EEF Documentation</name>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-source-plugin</artifactId>
+        <version>${tycho-version}</version>
+      </plugin>
+    </plugins>
+  </build>
+</project>
\ No newline at end of file
diff --git a/doc/org.eclipse.sirius.expression.design/.classpath b/doc/org.eclipse.sirius.expression.design/.classpath
deleted file mode 100644
index 39810b7d6..000000000
--- a/doc/org.eclipse.sirius.expression.design/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-  <classpathentry kind="src" path="src"/>
-  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-  <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-  <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/doc/org.eclipse.sirius.expression.design/.project b/doc/org.eclipse.sirius.expression.design/.project
deleted file mode 100644
index f77fd4860..000000000
--- a/doc/org.eclipse.sirius.expression.design/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.sirius.expression.design</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>org.eclipse.acceleo.ide.ui.acceleoBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.acceleo.ide.ui.acceleoNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/doc/org.eclipse.sirius.expression.design/META-INF/MANIFEST.MF b/doc/org.eclipse.sirius.expression.design/META-INF/MANIFEST.MF
deleted file mode 100644
index b9132d898..000000000
--- a/doc/org.eclipse.sirius.expression.design/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: org.eclipse.sirius.expression.design
-Bundle-SymbolicName: org.eclipse.sirius.expression.design;singleton:=true
-Bundle-Version: 1.0.0
-Bundle-Activator: org.eclipse.sirius.expression.design.Activator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.sirius,
- org.eclipse.sirius.common.acceleo.mtl
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/doc/org.eclipse.sirius.expression.design/about.html b/doc/org.eclipse.sirius.expression.design/about.html
deleted file mode 100644
index f3a55ce5f..000000000
--- a/doc/org.eclipse.sirius.expression.design/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 15, 2010</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/doc/org.eclipse.sirius.expression.design/build.properties b/doc/org.eclipse.sirius.expression.design/build.properties
deleted file mode 100644
index bbbc4ce49..000000000
--- a/doc/org.eclipse.sirius.expression.design/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               description/,\
-               plugin.xml
-customBuildCallbacks = build.acceleo
diff --git a/doc/org.eclipse.sirius.expression.design/description/expression.odesign b/doc/org.eclipse.sirius.expression.design/description/expression.odesign
deleted file mode 100644
index 68de55fe1..000000000
--- a/doc/org.eclipse.sirius.expression.design/description/expression.odesign
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<description:Group xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:description_2="http://www.eclipse.org/sirius/table/description/1.1.0" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:tool="http://www.eclipse.org/sirius/diagram/description/tool/1.1.0" xmlns:tool_1="http://www.eclipse.org/sirius/description/tool/1.1.0" name="expression" version="10.0.0.201505222000">
-  <ownedViewpoints name="DesignExpression">
-    <ownedRepresentations xsi:type="description_1:DiagramDescription" name="Design" domainClass="expression.ExpressionPackage" enablePopupBars="true">
-      <metamodel href="../../org.eclipse.sirius.expression/model/expression.ecore#/"/>
-      <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/>
-      <defaultLayer name="Default">
-        <edgeMappings name="Expressions" sourceMapping="//@ownedViewpoints[name='DesignExpression']/@ownedRepresentations[name='Design']/@defaultLayer/@containerMappings[name='ExpressionClass']/@subContainerMappings[name='ExpressionDescription']" targetMapping="//@ownedViewpoints[name='DesignExpression']/@ownedRepresentations[name='Design']/@defaultLayer/@containerMappings[name='EClass']/@subNodeMappings[name='Expression']" targetFinderExpression="feature:expression">
-          <style sizeComputationExpression="2">
-            <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
-            <centerLabelStyleDescription>
-              <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-          </style>
-        </edgeMappings>
-        <containerMappings name="ExpressionClass" semanticCandidatesExpression="feature:expressionClasses" domainClass="expression.ExpressionClass">
-          <subContainerMappings name="ExpressionDescription" labelDirectEdit="//@ownedViewpoints[name='DesignExpression']/@ownedRepresentations[name='Design']/@defaultLayer/@toolSections.0/@ownedTools[name='ExpressionDescriptionEdit']" semanticCandidatesExpression="feature:expressionDescriptions" domainClass="expression.ExpressionDescription">
-            <style xsi:type="style:FlatContainerStyleDescription" showIcon="false" labelExpression="aql:self.label + '['+ self.lowerBound+'..'+self.upperBound+']:'+self.returnType.name">
-              <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-              <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-              <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
-              <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
-            </style>
-          </subContainerMappings>
-          <subContainerMappings name="Variable" labelDirectEdit="//@ownedViewpoints[name='DesignExpression']/@ownedRepresentations[name='Design']/@additionalLayers[name='Variables']/@toolSections.0/@ownedTools[name='VariableEdit']" semanticCandidatesExpression="feature:variables" domainClass="expression.Variable">
-            <style xsi:type="style:FlatContainerStyleDescription" showIcon="false">
-              <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-              <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-              <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
-              <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_green']"/>
-            </style>
-          </subContainerMappings>
-          <style xsi:type="style:FlatContainerStyleDescription" showIcon="false" labelExpression="feature:label">
-            <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
-            <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
-          </style>
-        </containerMappings>
-        <containerMappings name="EClass" semanticCandidatesExpression="aql:self.ePackage.eClassifiers->filter(ecore::EClass)" domainClass="ecore.EClass">
-          <subNodeMappings name="Expression" semanticCandidatesExpression="aql:self.eAllContents(ecore::EAttribute)->select(e|e.name.contains('Expression'))" domainClass="ecore.EAttribute">
-            <style xsi:type="style:SquareDescription" showIcon="false" sizeComputationExpression="5" labelPosition="node" resizeKind="NSEW">
-              <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-              <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-              <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='purple']"/>
-            </style>
-          </subNodeMappings>
-          <style xsi:type="style:FlatContainerStyleDescription">
-            <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
-            <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_orange']"/>
-          </style>
-        </containerMappings>
-        <toolSections>
-          <ownedTools xsi:type="tool:ContainerCreationDescription" name="ExpressionClassCreate" label="ExpressionClass" containerMappings="//@ownedViewpoints[name='DesignExpression']/@ownedRepresentations[name='Design']/@defaultLayer/@containerMappings[name='ExpressionClass']" extraMappings="//@ownedViewpoints[name='DesignExpression']/@ownedRepresentations[name='Design']/@defaultLayer/@containerMappings[name='EClass']">
-            <variable name="container"/>
-            <viewVariable name="containerView"/>
-            <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="aql:containerView.eContainer().target">
-                <subModelOperations xsi:type="tool_1:CreateInstance" typeName="expression.ExpressionClass" referenceName="expressionClasses">
-                  <subModelOperations xsi:type="tool_1:SetValue" featureName="label" valueExpression="aql:containerView.target.name"/>
-                </subModelOperations>
-              </firstModelOperations>
-            </initialOperation>
-          </ownedTools>
-          <ownedTools xsi:type="tool:ContainerCreationDescription" name="ExpressionDescriptionCreate" label="ExpressionDescription" containerMappings="//@ownedViewpoints[name='DesignExpression']/@ownedRepresentations[name='Design']/@defaultLayer/@containerMappings[name='ExpressionClass']/@subContainerMappings[name='ExpressionDescription']">
-            <variable name="container"/>
-            <viewVariable name="containerView"/>
-            <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
-                <subModelOperations xsi:type="tool_1:CreateInstance" typeName="expression.ExpressionDescription" referenceName="expressionDescriptions"/>
-              </firstModelOperations>
-            </initialOperation>
-          </ownedTools>
-          <ownedTools xsi:type="tool:DirectEditLabel" name="ExpressionDescriptionEdit">
-            <mask mask="{0}[{1}..{2}]:{3}"/>
-            <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
-                <subModelOperations xsi:type="tool_1:SetValue" featureName="label" valueExpression="var:arg0"/>
-                <subModelOperations xsi:type="tool_1:SetValue" featureName="lowerBound" valueExpression="var:arg1"/>
-                <subModelOperations xsi:type="tool_1:SetValue" featureName="upperBound" valueExpression="var:arg2"/>
-              </firstModelOperations>
-            </initialOperation>
-          </ownedTools>
-          <ownedTools xsi:type="tool:EdgeCreationDescription" name="ExpressionDescriptionToExpression" edgeMappings="//@ownedViewpoints[name='DesignExpression']/@ownedRepresentations[name='Design']/@defaultLayer/@edgeMappings[name='Expressions']">
-            <sourceVariable name="source"/>
-            <targetVariable name="target"/>
-            <sourceViewVariable name="sourceView"/>
-            <targetViewVariable name="targetView"/>
-            <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source">
-                <subModelOperations xsi:type="tool_1:SetValue" featureName="expression" valueExpression="var:target"/>
-                <subModelOperations xsi:type="tool_1:SetValue" featureName="label" valueExpression="aql:target.name"/>
-              </firstModelOperations>
-            </initialOperation>
-          </ownedTools>
-        </toolSections>
-      </defaultLayer>
-      <additionalLayers name="Variables">
-        <edgeMappings name="Variables" sourceMapping="//@ownedViewpoints[name='DesignExpression']/@ownedRepresentations[name='Design']/@defaultLayer/@containerMappings[name='ExpressionClass']/@subContainerMappings[name='ExpressionDescription']" targetMapping="//@ownedViewpoints[name='DesignExpression']/@ownedRepresentations[name='Design']/@defaultLayer/@containerMappings[name='ExpressionClass']/@subContainerMappings[name='Variable']" targetFinderExpression="feature:variables">
-          <style sizeComputationExpression="2">
-            <strokeColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='gray']"/>
-            <centerLabelStyleDescription>
-              <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </centerLabelStyleDescription>
-          </style>
-        </edgeMappings>
-        <toolSections>
-          <ownedTools xsi:type="tool:EdgeCreationDescription" name="ExpressionToVariable" edgeMappings="//@ownedViewpoints[name='DesignExpression']/@ownedRepresentations[name='Design']/@additionalLayers[name='Variables']/@edgeMappings[name='Variables']">
-            <sourceVariable name="source"/>
-            <targetVariable name="target"/>
-            <sourceViewVariable name="sourceView"/>
-            <targetViewVariable name="targetView"/>
-            <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:source">
-                <subModelOperations xsi:type="tool_1:SetValue" featureName="variables" valueExpression="var:target"/>
-              </firstModelOperations>
-            </initialOperation>
-          </ownedTools>
-          <ownedTools xsi:type="tool:ContainerCreationDescription" name="VariableCreate" label="Variable" containerMappings="//@ownedViewpoints[name='DesignExpression']/@ownedRepresentations[name='Design']/@defaultLayer/@containerMappings[name='ExpressionClass']/@subContainerMappings[name='Variable']">
-            <variable name="container"/>
-            <viewVariable name="containerView"/>
-            <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:container">
-                <subModelOperations xsi:type="tool_1:CreateInstance" typeName="expression.Variable" referenceName="variables"/>
-              </firstModelOperations>
-            </initialOperation>
-          </ownedTools>
-          <ownedTools xsi:type="tool:DirectEditLabel" name="VariableEdit">
-            <mask mask="{0}"/>
-            <initialOperation>
-              <firstModelOperations xsi:type="tool_1:ChangeContext" browseExpression="var:self">
-                <subModelOperations xsi:type="tool_1:SetValue" featureName="name" valueExpression="var:arg0"/>
-              </firstModelOperations>
-            </initialOperation>
-          </ownedTools>
-        </toolSections>
-      </additionalLayers>
-    </ownedRepresentations>
-    <ownedRepresentations xsi:type="description_2:CrossTableDescription" name="ExpressionToVariables" domainClass="expression.ExpressionPackage">
-      <metamodel href="../../org.eclipse.sirius.expression/model/expression.ecore#/"/>
-      <ownedLineMappings name="ExpressionClass" domainClass="expression.ExpressionClass" semanticCandidatesExpression="feature:expressionClasses" headerLabelExpression="feature:label">
-        <ownedSubLines name="ExpressionDescription" domainClass="expression.ExpressionDescription" semanticCandidatesExpression="feature:expressionDescriptions" headerLabelExpression="feature:label"/>
-      </ownedLineMappings>
-      <ownedColumnMappings name="Variables" headerLabelExpression="aql:self.eContainer().label+'\n'+self.name" initialWidth="100" domainClass="expression.Variable"/>
-      <intersection name="Variables" lineMapping="//@ownedViewpoints[name='DesignExpression']/@ownedRepresentations[name='ExpressionToVariables']/@ownedLineMappings[name='ExpressionClass']/@ownedSubLines[name='ExpressionDescription']" columnMapping="//@ownedViewpoints[name='DesignExpression']/@ownedRepresentations[name='ExpressionToVariables']/@ownedColumnMappings.0" labelExpression="x" columnFinderExpression="feature:variables">
-        <directEdit>
-          <variables name="element" documentation="The currently edited element."/>
-          <variables name="lineSemantic" documentation="The semantic element corresponding to the line."/>
-          <variables name="columnSemantic" documentation="The semantic element corresponding to the column (only available for Intersection Mapping)."/>
-          <variables name="root" documentation="The semantic element of the table."/>
-          <firstModelOperation xsi:type="tool_1:ChangeContext" browseExpression="var:lineSemantic">
-            <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:arg0&lt;>''">
-              <subModelOperations xsi:type="tool_1:SetValue" featureName="variables" valueExpression="var:columnSemantic"/>
-            </subModelOperations>
-            <subModelOperations xsi:type="tool_1:If" conditionExpression="aql:arg0=''">
-              <subModelOperations xsi:type="tool_1:Unset" featureName="variables" elementExpression="var:columnSemantic"/>
-            </subModelOperations>
-          </firstModelOperation>
-          <mask mask="{0}"/>
-        </directEdit>
-      </intersection>
-    </ownedRepresentations>
-    <ownedRepresentations xsi:type="description_2:CrossTableDescription" name="ExpressionToContextableElements" domainClass="expression.ExpressionPackage">
-      <metamodel href="../../org.eclipse.sirius.expression/model/expression.ecore#/"/>
-      <metamodel href="http://www.eclipse.org/emf/2002/Ecore#/"/>
-      <ownedLineMappings name="ExpressionClass" domainClass="expression.ExpressionClass" semanticCandidatesExpression="feature:expressionClasses" headerLabelExpression="feature:label">
-        <ownedSubLines name="ExpressionDescription" domainClass="expression.ExpressionDescription" semanticCandidatesExpression="feature:expressionDescriptions" headerLabelExpression="feature:label"/>
-      </ownedLineMappings>
-      <ownedColumnMappings name="ContextableElement" headerLabelExpression="feature:name" domainClass="ecore.EClass" semanticCandidatesExpression="aql:self.ePackage.eClassifiers->filter(ecore::EClass)"/>
-      <intersection name="ContextableElements" lineMapping="//@ownedViewpoints[name='DesignExpression']/@ownedRepresentations[name='ExpressionToContextableElements']/@ownedLineMappings[name='ExpressionClass']/@ownedSubLines[name='ExpressionDescription']" columnMapping="//@ownedViewpoints[name='DesignExpression']/@ownedRepresentations[name='ExpressionToContextableElements']/@ownedColumnMappings.0" labelExpression="x" columnFinderExpression="aql:self.contextableElements">
-        <directEdit>
-          <variables name="element" documentation="The currently edited element."/>
-          <variables name="lineSemantic" documentation="The semantic element corresponding to the line."/>
-          <variables name="columnSemantic" documentation="The semantic element corresponding to the column (only available for Intersection Mapping)."/>
-          <variables name="root" documentation="The semantic element of the table."/>
-          <firstModelOperation xsi:type="tool_1:ChangeContext" browseExpression="var:lineSemantic">
-            <subModelOperations xsi:type="tool_1:If" conditionExpression="[arg0&lt;>''/]">
-              <subModelOperations xsi:type="tool_1:SetValue" featureName="contextableElements" valueExpression="var:columnSemantic"/>
-            </subModelOperations>
-            <subModelOperations xsi:type="tool_1:If" conditionExpression="[arg0=''/]">
-              <subModelOperations xsi:type="tool_1:Unset" featureName="contextableElements" elementExpression="var:columnSemantic"/>
-            </subModelOperations>
-          </firstModelOperation>
-          <mask mask="{0}"/>
-        </directEdit>
-      </intersection>
-    </ownedRepresentations>
-    <ownedJavaExtensions/>
-  </ownedViewpoints>
-</description:Group>
diff --git a/doc/org.eclipse.sirius.expression.design/plugin.xml b/doc/org.eclipse.sirius.expression.design/plugin.xml
deleted file mode 100644
index 5ecb2c479..000000000
--- a/doc/org.eclipse.sirius.expression.design/plugin.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-  <extension point="org.eclipse.sirius.componentization">
-    <component class="org.eclipse.sirius.expression.design.Activator"
-               id="org.eclipse.sirius.expression.design"
-	       name="expression">
-    </component>
-  </extension>
-</plugin>
diff --git a/doc/org.eclipse.sirius.expression.design/src/org/eclipse/sirius/expression/design/Activator.java b/doc/org.eclipse.sirius.expression.design/src/org/eclipse/sirius/expression/design/Activator.java
deleted file mode 100644
index f4b15886c..000000000
--- a/doc/org.eclipse.sirius.expression.design/src/org/eclipse/sirius/expression/design/Activator.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.eclipse.sirius.expression.design;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.sirius.business.api.componentization.ViewpointRegistry;
-import org.eclipse.sirius.viewpoint.description.Viewpoint;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-    // The plug-in ID
-    public static final String PLUGIN_ID = "org.eclipse.sirius.expression.design";
-
-    // The shared instance
-    private static Activator plugin;
-
-    private static Set<Viewpoint> viewpoints; 
-
-    /**
-     * The constructor
-     */
-    public Activator() {
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-     */
-    public void start(BundleContext context) throws Exception {
-      super.start(context);
-	  plugin = this;
-	  viewpoints = new HashSet<Viewpoint>();
-	  viewpoints.addAll(ViewpointRegistry.getInstance().registerFromPlugin(PLUGIN_ID + "/description/expression.odesign")); 
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-     */
-    public void stop(BundleContext context) throws Exception {
-	plugin = null;
-	if (viewpoints != null) {
-	    for (final Viewpoint viewpoint: viewpoints) {
-		ViewpointRegistry.getInstance().disposeFromPlugin(viewpoint);
-	    }
-	    viewpoints.clear();
-	    viewpoints = null; 
-	}
-	super.stop(context);
-    }
-
-    /**
-     * Returns the shared instance
-     * 
-     * @return the shared instance
-     */
-    public static Activator getDefault() {
-	return plugin;
-    }
-}