[436833] Introduce a Sirius-Aware Properties Edition Component

This PropertiesEditionComponent will make sure not to install/uninstall
the adapter used by EEF to listen for changes but to reuse the same
instance.

A SessionManagerListener is introduced to uninstall the adapter when the
session is getting closed.

Note that this change uses APIs provided by EEF 1.5 and requires an
upgrade then.

Bug: 436833
Change-Id: Id08788abfbcc930fc8091f7ec38eefff19aa4672
Signed-off-by: Cedric Brun <cedric.brun@obeo.fr>
Signed-off-by: Laurent Fasani <laurent.fasani@obeo.fr>

22 files changed, 180 insertions, 34 deletions

diff --git a/plugins/org.eclipse.sirius.doc/doc/Release Notes.html b/plugins/org.eclipse.sirius.doc/doc/Release Notes.html
index 309de14972..ae0a83ef7e 100644
--- a/plugins/org.eclipse.sirius.doc/doc/Release Notes.html
+++ b/plugins/org.eclipse.sirius.doc/doc/Release Notes.html
@@ -649,6 +649,23 @@
 				<code>CreatedOutput</code> represents the output model element which will become the parent of the elements created from the evaluation result.
 			</li>
 		</ul>
+		<h4 id="Changesinorg.eclipse.sirius.eef.adapters">Changes in 
+			<code>org.eclipse.sirius.eef.adapters</code>
+		</h4>
+		<ul>
+			<li>This plug-in now requires the version 1.5.0 of 
+				<code>org.eclipse.emf.eef.runtime</code> bundle. This plug-in 
+				<strong>optimizes EEF performance with Sirius</strong> using 
+				<strong>org.eclipse.sirius.eef.components.SiriusAwarePropertiesEditingComponent</strong> as root class of the generated EEF components. Refer to 
+				<strong>Using the Extended Editing Framework with Sirius</strong> documentation.
+			</li>
+			<li>The following packages are set to x-internal:=true
+				<ul>
+					<li>org.eclipse.sirius.eef.actions</li>
+					<li>org.eclipse.sirius.eef.adapters</li>
+				</ul>
+			</li>
+		</ul>
 		<h4 id="Changesinorg.eclipse.sirius.tests.junit.support">Changes in 
 			<code>org.eclipse.sirius.tests.junit.support</code>
 		</h4>
diff --git a/plugins/org.eclipse.sirius.doc/doc/Release Notes.textile b/plugins/org.eclipse.sirius.doc/doc/Release Notes.textile
index 61417acb27..df7fff6c11 100644
--- a/plugins/org.eclipse.sirius.doc/doc/Release Notes.textile
+++ b/plugins/org.eclipse.sirius.doc/doc/Release Notes.textile
@@ -185,6 +185,13 @@ h4. Changes in @org.eclipse.sirius.synchronizer@
 * The method @org.eclipse.sirius.synchronizer.SemanticPartitionInvalidator.hasFastResult(EObject, SemanticPartition, CreatedOutput)@ now takes a @CreatedOutput@ as additional parameter element to allow to have the parent output element.
 * The method @org.eclipse.sirius.synchronizer.SemanticPartition.evaluate(EObject, CreatedOutput)@ now takes a @CreatedOutput@ as additional parameter. This @CreatedOutput@ represents the output model element which will become the parent of the elements created from the evaluation result.
 
+h4. Changes in @org.eclipse.sirius.eef.adapters@
+
+* This plug-in now requires the version 1.5.0 of @org.eclipse.emf.eef.runtime@ bundle. This plug-in *optimizes EEF performance with Sirius* using *org.eclipse.sirius.eef.components.SiriusAwarePropertiesEditingComponent* as root class of the generated EEF components. Refer to *Using the Extended Editing Framework with Sirius* documentation.
+* The following packages are set to x-internal:=true
+** org.eclipse.sirius.eef.actions
+** org.eclipse.sirius.eef.adapters
+
 h4. Changes in @org.eclipse.sirius.tests.junit.support@
 
 * The method @org.eclipse.sirius.tests.support.api.EclipseTestsSupportHelper.setReadOnlyStatus(boolean, IResource...)@ has been added to change the read only status of the given resources.
diff --git a/plugins/org.eclipse.sirius.eef.adapters/META-INF/MANIFEST.MF b/plugins/org.eclipse.sirius.eef.adapters/META-INF/MANIFEST.MF
index cc27421915..acdd064337 100644
--- a/plugins/org.eclipse.sirius.eef.adapters/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.sirius.eef.adapters/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.8.2",
  org.eclipse.core.runtime;bundle-version="3.8.0",
  org.eclipse.help;bundle-version="3.6.0",
  org.eclipse.sirius;bundle-version="2.0.0",
- org.eclipse.emf.eef.runtime;bundle-version="1.2.0",
+ org.eclipse.emf.eef.runtime;bundle-version="1.5.0",
  org.eclipse.sirius.diagram;bundle-version="2.0.0",
  org.eclipse.sirius.diagram.ui;bundle-version="2.0.0",
  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.6.0",
@@ -16,8 +16,10 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.8.2",
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: %providerName
-Export-Package: org.eclipse.sirius.eef.actions;version="2.0.4",
- org.eclipse.sirius.eef.adapters;version="2.0.4",
+Export-Package: org.eclipse.sirius.eef.actions;x-internal:=true;version="2.0.4",
+ org.eclipse.sirius.eef.adapters;x-internal:=true;version="2.0.4",
+ org.eclipse.sirius.eef.components;version="3.0.0",
+ org.eclipse.sirius.eef.listeners;x-internal:=true;version="3.0.0",
  org.eclipse.sirius.eef.section;version="2.0.4",
  org.eclipse.sirius.eef.util;version="2.0.4"
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.sirius.eef.adapters/doc/images/2-1 - Leaf Components.png b/plugins/org.eclipse.sirius.eef.adapters/doc/images/2-1 - Leaf Components.png
new file mode 100644
index 0000000000..ff1689e5f0
--- /dev/null
+++ b/plugins/org.eclipse.sirius.eef.adapters/doc/images/2-1 - Leaf Components.png
diff --git a/plugins/org.eclipse.sirius.eef.adapters/doc/textile/viewpoint-eef.html b/plugins/org.eclipse.sirius.eef.adapters/doc/textile/viewpoint-eef.html
index 56dd05b296..7f2530e36d 100644
--- a/plugins/org.eclipse.sirius.eef.adapters/doc/textile/viewpoint-eef.html
+++ b/plugins/org.eclipse.sirius.eef.adapters/doc/textile/viewpoint-eef.html
@@ -85,6 +85,14 @@
 		<p>
 			<img class="shadow" border="0" src="../images/2 - VP Contributor ID.png"/>
 		</p>
+		<p>In order to 
+			<strong>optimize EEF performance with Sirius</strong>, change the root class of the generated EEF components to a dedicated Sirius aware components. This can be done by defining the value of the 
+			<em>Leaf Components Super Class</em> to 
+			<strong>org.eclipse.sirius.eef.components.SiriusAwarePropertiesEditingComponent</strong>.
+		</p>
+		<p>
+			<img class="shadow" border="0" src="../images/2-1 - Leaf Components.png"/>
+		</p>
 		<p>Another interesting properties can be changed in this model, the generation directory. Default initialization set this value to the folder 
 			<em>src-gen</em>  of the plug-in containing the EEF models.
 		</p>
diff --git a/plugins/org.eclipse.sirius.eef.adapters/doc/textile/viewpoint-eef.textile b/plugins/org.eclipse.sirius.eef.adapters/doc/textile/viewpoint-eef.textile
index 7ee943838e..dcfe9e132a 100644
--- a/plugins/org.eclipse.sirius.eef.adapters/doc/textile/viewpoint-eef.textile
+++ b/plugins/org.eclipse.sirius.eef.adapters/doc/textile/viewpoint-eef.textile
@@ -21,6 +21,10 @@ If you plan to use EEF properties only in a designer  (for diagrams, tables, ...
 
 !(shadow)../images/2 - VP Contributor ID.png!
 
+In order to *optimize EEF performance with Sirius*, change the root class of the generated EEF components to a dedicated Sirius aware components. This can be done by defining the value of the _Leaf Components Super Class_ to *org.eclipse.sirius.eef.components.SiriusAwarePropertiesEditingComponent*.
+
+!(shadow)../images/2-1 - Leaf Components.png!
+
 Another interesting properties can be changed in this model, the generation directory. Default initialization set this value to the folder _src-gen_  of the plug-in containing the EEF models.
 
 h3. Generating EEF code
diff --git a/plugins/org.eclipse.sirius.eef.adapters/plugin.xml b/plugins/org.eclipse.sirius.eef.adapters/plugin.xml
index 9821b3c98a..81c35d0c48 100644
--- a/plugins/org.eclipse.sirius.eef.adapters/plugin.xml
+++ b/plugins/org.eclipse.sirius.eef.adapters/plugin.xml
@@ -41,4 +41,10 @@
          <adapter type="org.eclipse.emf.eef.runtime.api.adapters.SemanticAdapter" />
       </factory>
    </extension>
+   <extension
+         point="org.eclipse.sirius.sessionManagerListener">
+      <listener
+            class="org.eclipse.sirius.eef.listeners.EEFSessionManagerListener">
+      </listener>
+   </extension>
 </plugin>
diff --git a/plugins/org.eclipse.sirius.eef.adapters/src/org/eclipse/sirius/eef/components/SiriusAwarePropertiesEditingComponent.java b/plugins/org.eclipse.sirius.eef.adapters/src/org/eclipse/sirius/eef/components/SiriusAwarePropertiesEditingComponent.java
new file mode 100644
index 0000000000..e69f75f276
--- /dev/null
+++ b/plugins/org.eclipse.sirius.eef.adapters/src/org/eclipse/sirius/eef/components/SiriusAwarePropertiesEditingComponent.java
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * 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
+ *******************************************************************************/
+package org.eclipse.sirius.eef.components;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.eef.runtime.api.notify.IPropertiesEditionComponentListener;
+import org.eclipse.emf.eef.runtime.context.ExtendedPropertiesEditingContext;
+import org.eclipse.emf.eef.runtime.context.PropertiesEditingContext;
+import org.eclipse.emf.eef.runtime.impl.components.SinglePartPropertiesEditingComponent;
+import org.eclipse.emf.eef.runtime.impl.services.PropertiesEditionComponentListenerProviderService;
+import org.eclipse.sirius.business.api.session.SessionManager;
+
+/**
+ * Override of the {@link SinglePartPropertiesEditingComponent} preventing the
+ * excessive removing of EEF SemanticListener.
+ * 
+ * @author <a href="mailto:cedric.brun@obeo.fr">Cedric Brun</a>
+ */
+public abstract class SiriusAwarePropertiesEditingComponent extends SinglePartPropertiesEditingComponent {
+    /**
+     * Create a new properties editing component which leverages the Sirius apis
+     * to be more efficient.
+     * 
+     * @param editingContext
+     *            the current editing context.
+     * @param semanticObject
+     *            the semantic object.
+     * @param editingMode
+     *            the editing mode.
+     */
+    public SiriusAwarePropertiesEditingComponent(PropertiesEditingContext editingContext, EObject semanticObject, String editingMode) {
+        super(editingContext, semanticObject, editingMode);
+    }
+
+    @Override
+    public void deactivate() {
+        if (semanticAdapter != null) {
+            PropertiesEditingContext editingContext = getEditingContext();
+            if (editingContext instanceof ExtendedPropertiesEditingContext && ((ExtendedPropertiesEditingContext) editingContext).canReachResourceSetAdapter()) {
+                if (SessionManager.INSTANCE.getSession(getEditingContext().getEObject()) != null) {
+                    ((ExtendedPropertiesEditingContext) editingContext).getResourceSetAdapter().unregisterEditingSemanticListener(semanticAdapter);
+                } else {
+                    ((ExtendedPropertiesEditingContext) editingContext).getResourceSetAdapter().removeEditingSemanticListener(semanticAdapter);
+                }
+            }
+        }
+        for (IPropertiesEditionComponentListener listener : PropertiesEditionComponentListenerProviderService.getInstance().getListeners()) {
+            listener.deactivate(this);
+        }
+    }
+
+}
diff --git a/plugins/org.eclipse.sirius.eef.adapters/src/org/eclipse/sirius/eef/listeners/EEFSessionManagerListener.java b/plugins/org.eclipse.sirius.eef.adapters/src/org/eclipse/sirius/eef/listeners/EEFSessionManagerListener.java
new file mode 100644
index 0000000000..c46f3d2977
--- /dev/null
+++ b/plugins/org.eclipse.sirius.eef.adapters/src/org/eclipse/sirius/eef/listeners/EEFSessionManagerListener.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * 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
+ *******************************************************************************/
+package org.eclipse.sirius.eef.listeners;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.eef.runtime.api.notify.ResourceSetAdapter;
+import org.eclipse.sirius.business.api.session.Session;
+import org.eclipse.sirius.business.api.session.SessionManagerListener.Stub;
+
+/**
+ * {@link SessionManagerListener} managing the EEF adapters.
+ * 
+ * @author <a href="mailto:cedric.brun@obeo.fr">Cedric Brun</a>
+ */
+public class EEFSessionManagerListener extends Stub {
+
+    @Override
+    public void notifyRemoveSession(Session removedSession) {
+        ResourceSet resourceSet = removedSession.getTransactionalEditingDomain().getResourceSet();
+        Adapter existingAdapter = EcoreUtil.getExistingAdapter(resourceSet, ResourceSetAdapter.class);
+        if (existingAdapter != null) {
+            resourceSet.eAdapters().remove(existingAdapter);
+        }
+    }
+
+}
diff --git a/releng/org.eclipse.sirius.targets/modules/eef-1.2.tpd b/releng/org.eclipse.sirius.targets/modules/eef-1.2.tpd
deleted file mode 100644
index 7d42c9b02e..0000000000
--- a/releng/org.eclipse.sirius.targets/modules/eef-1.2.tpd
+++ /dev/null
@@ -1,7 +0,0 @@
-target "eef-1.2"
-
-with source, requirements
-
-location EEF-1_2 "http://download.eclipse.org/modeling/emft/eef/updates/releases/1.2" {
-        org.eclipse.emf.eef.runtime-feature.feature.group [1.0.0,2.0.0)
-}
diff --git a/releng/org.eclipse.sirius.targets/modules/eef-1.5.tpd b/releng/org.eclipse.sirius.targets/modules/eef-1.5.tpd
new file mode 100644
index 0000000000..6fccc58f89
--- /dev/null
+++ b/releng/org.eclipse.sirius.targets/modules/eef-1.5.tpd
@@ -0,0 +1,7 @@
+target "eef-1.5"
+
+with source, requirements
+
+location EEF-1_5 "http://download.eclipse.org/modeling/emft/eef/updates/milestones/1.5/S201412231052" {
+        org.eclipse.emf.eef.runtime-feature.feature.group [1.5.0,2.0.0)
+}
diff --git a/releng/org.eclipse.sirius.targets/sirius_juno.target b/releng/org.eclipse.sirius.targets/sirius_juno.target
index dffe02f410..ec014f3285 100644
--- a/releng/org.eclipse.sirius.targets/sirius_juno.target
+++ b/releng/org.eclipse.sirius.targets/sirius_juno.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="sirius_juno" sequenceNumber="1430754472">
+<target name="sirius_juno" sequenceNumber="1431013039">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.acceleo.doc.feature.group" version="3.4.1.201309031307"/>
@@ -13,8 +13,8 @@
       <repository id="Acceleo-3_4" location="http://download.eclipse.org/acceleo/updates/releases/3.4/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.eef.runtime-feature.feature.group" version="1.2.2.201309121245"/>
-      <repository id="EEF-1_2" location="http://download.eclipse.org/modeling/emft/eef/updates/releases/1.2"/>
+      <unit id="org.eclipse.emf.eef.runtime-feature.feature.group" version="1.5.0.201412231052"/>
+      <repository id="EEF-1_5" location="http://download.eclipse.org/modeling/emft/eef/updates/milestones/1.5/S201412231052"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.emf.compare.feature.group" version="2.1.2.201310031412"/>
diff --git a/releng/org.eclipse.sirius.targets/sirius_juno.targetplatform b/releng/org.eclipse.sirius.targets/sirius_juno.targetplatform
index 5039a9868b..ea9088ebab 100644
--- a/releng/org.eclipse.sirius.targets/sirius_juno.targetplatform
+++ b/releng/org.eclipse.sirius.targets/sirius_juno.targetplatform
@@ -1,7 +1,7 @@
 target "sirius_juno"
 
 include "modules/acceleo-3.4.tpd"
-include "modules/eef-1.2.tpd"
+include "modules/eef-1.5.tpd"
 include "modules/emf-compare-2.1.tpd"
 include "modules/orbit.tpd"
 include "modules/swtbot-2.1.tpd"
diff --git a/releng/org.eclipse.sirius.targets/sirius_kepler.target b/releng/org.eclipse.sirius.targets/sirius_kepler.target
index ca7627c971..e5881f0c8d 100644
--- a/releng/org.eclipse.sirius.targets/sirius_kepler.target
+++ b/releng/org.eclipse.sirius.targets/sirius_kepler.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="sirius_kepler" sequenceNumber="1430754481">
+<target name="sirius_kepler" sequenceNumber="1431013424">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.acceleo.doc.feature.group" version="3.4.1.201309031307"/>
@@ -13,8 +13,8 @@
       <repository id="Acceleo-3_4" location="http://download.eclipse.org/acceleo/updates/releases/3.4/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.eef.runtime-feature.feature.group" version="1.2.2.201309121245"/>
-      <repository id="EEF-1_2" location="http://download.eclipse.org/modeling/emft/eef/updates/releases/1.2"/>
+      <unit id="org.eclipse.emf.eef.runtime-feature.feature.group" version="1.5.0.201412231052"/>
+      <repository id="EEF-1_5" location="http://download.eclipse.org/modeling/emft/eef/updates/milestones/1.5/S201412231052"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.emf.compare.feature.group" version="2.1.2.201310031412"/>
diff --git a/releng/org.eclipse.sirius.targets/sirius_kepler.targetplatform b/releng/org.eclipse.sirius.targets/sirius_kepler.targetplatform
index 1f4a8eb28e..e8c9053ee5 100644
--- a/releng/org.eclipse.sirius.targets/sirius_kepler.targetplatform
+++ b/releng/org.eclipse.sirius.targets/sirius_kepler.targetplatform
@@ -1,7 +1,7 @@
 target "sirius_kepler"
 
 include "modules/acceleo-3.4.tpd"
-include "modules/eef-1.2.tpd"
+include "modules/eef-1.5.tpd"
 include "modules/emf-compare-2.1.tpd"
 include "modules/orbit.tpd"
 include "modules/swtbot-2.1.tpd"
diff --git a/releng/org.eclipse.sirius.targets/sirius_luna.target b/releng/org.eclipse.sirius.targets/sirius_luna.target
index 89e430a862..3ff1ec4f47 100644
--- a/releng/org.eclipse.sirius.targets/sirius_luna.target
+++ b/releng/org.eclipse.sirius.targets/sirius_luna.target
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="sirius_luna" sequenceNumber="1430754492">
+<target name="sirius_luna" sequenceNumber="1431015172">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.eef.runtime-feature.feature.group" version="1.5.0.201412231052"/>
+      <repository id="EEF-1_5" location="http://download.eclipse.org/modeling/emft/eef/updates/milestones/1.5/S201412231052"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
       <unit id="org.easymock" version="2.4.0.v20090202-0900"/>
       <unit id="org.hamcrest.core" version="1.3.0.v201303031735"/>
@@ -39,7 +43,6 @@
       <unit id="org.eclipse.emf.compare.feature.group" version="3.0.2.201501201328"/>
       <unit id="org.eclipse.emf.ecore.feature.group" version="2.10.2.v20150123-0348"/>
       <unit id="org.eclipse.emf.edit.feature.group" version="2.10.1.v20150123-0452"/>
-      <unit id="org.eclipse.emf.eef.runtime" version="1.3.0.201311221533"/>
       <unit id="org.eclipse.emf.feature.group" version="2.10.2.v20150123-0452"/>
       <unit id="org.eclipse.emf.sdk.feature.group" version="2.10.2.v20150123-0452"/>
       <unit id="org.eclipse.emf.transaction.feature.group" version="1.8.0.201405281451"/>
diff --git a/releng/org.eclipse.sirius.targets/sirius_luna.targetplatform b/releng/org.eclipse.sirius.targets/sirius_luna.targetplatform
index 1ee1d448fa..36e0762246 100644
--- a/releng/org.eclipse.sirius.targets/sirius_luna.targetplatform
+++ b/releng/org.eclipse.sirius.targets/sirius_luna.targetplatform
@@ -1,5 +1,6 @@
 target "sirius_luna"
 
+include "modules/eef-1.5.tpd"
 include "modules/orbit.tpd"
 include "modules/swtbot-2.1.tpd"
 include "modules/shared-license.tpd"
@@ -17,7 +18,6 @@ location Eclipse-Luna "http://download.eclipse.org/releases/luna" {
         org.eclipse.emf.compare.feature.group [3.0.0,4.0.0)
         org.eclipse.emf.ecore.feature.group [2.10.0,2.11.0)
         org.eclipse.emf.edit.feature.group [2.10.0,2.11.0)
-        org.eclipse.emf.eef.runtime [1.2.0,2.0.0)
         org.eclipse.emf.feature.group [2.10.0,2.11.0)
         org.eclipse.emf.sdk.feature.group [2.10.0,2.11.0)
         org.eclipse.emf.transaction.feature.group [1.8.0,1.9.0)
diff --git a/releng/org.eclipse.sirius.targets/sirius_mars.targetplatform b/releng/org.eclipse.sirius.targets/sirius_mars.targetplatform
index 14a33998cf..f26d3cc338 100644
--- a/releng/org.eclipse.sirius.targets/sirius_mars.targetplatform
+++ b/releng/org.eclipse.sirius.targets/sirius_mars.targetplatform
@@ -17,7 +17,7 @@ location Eclipse-Mars "http://download.eclipse.org/releases/mars" {
         org.eclipse.emf.compare.feature.group [3.1.0,4.0.0)
         org.eclipse.emf.ecore.feature.group [2.11.0,2.12.0)
         org.eclipse.emf.edit.feature.group [2.11.0,2.12.0)
-        org.eclipse.emf.eef.runtime [1.3.0,2.0.0)
+        org.eclipse.emf.eef.runtime [1.5.0,2.0.0)
         org.eclipse.emf.feature.group [2.11.0,2.12.0)
         org.eclipse.emf.sdk.feature.group [2.11.0,2.12.0)
         org.eclipse.emf.transaction.feature.group [1.9.0,1.10.0)
diff --git a/releng/org.eclipse.sirius.targets/sirius_tests_canary.target b/releng/org.eclipse.sirius.targets/sirius_tests_canary.target
index 9f0d6cca4e..1296e1c859 100644
--- a/releng/org.eclipse.sirius.targets/sirius_tests_canary.target
+++ b/releng/org.eclipse.sirius.targets/sirius_tests_canary.target
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="sirius_tests_canary" sequenceNumber="1430810155">
+<target name="sirius_tests_canary" sequenceNumber="1431329370">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
       <repository id="Eclipse-Shared-License" location="http://download.eclipse.org/cbi/updates/license"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.platform.ide" version="4.5.0.I20150503-2000"/>
-      <unit id="org.eclipse.platform.sdk" version="4.5.0.I20150503-2000"/>
-      <unit id="org.eclipse.sdk.ide" version="4.5.0.I20150503-2000"/>
+      <unit id="org.eclipse.platform.ide" version="4.5.0.I20150510-2000"/>
+      <unit id="org.eclipse.platform.sdk" version="4.5.0.I20150510-2000"/>
+      <unit id="org.eclipse.sdk.ide" version="4.5.0.I20150510-2000"/>
       <repository id="Eclipse-Mars-Integration" location="http://download.eclipse.org/eclipse/updates/4.5-I-builds"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
diff --git a/releng/org.eclipse.sirius.targets/sirius_tests_juno.target b/releng/org.eclipse.sirius.targets/sirius_tests_juno.target
index 2548dd307c..fb5465f2ed 100644
--- a/releng/org.eclipse.sirius.targets/sirius_tests_juno.target
+++ b/releng/org.eclipse.sirius.targets/sirius_tests_juno.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="sirius_tests_juno" sequenceNumber="1430754721">
+<target name="sirius_tests_juno" sequenceNumber="1431329321">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.acceleo.doc.feature.group" version="3.4.1.201309031307"/>
@@ -13,8 +13,8 @@
       <repository id="Acceleo-3_4" location="http://download.eclipse.org/acceleo/updates/releases/3.4/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.eef.runtime-feature.feature.group" version="1.2.2.201309121245"/>
-      <repository id="EEF-1_2" location="http://download.eclipse.org/modeling/emft/eef/updates/releases/1.2"/>
+      <unit id="org.eclipse.emf.eef.runtime-feature.feature.group" version="1.5.0.201412231052"/>
+      <repository id="EEF-1_5" location="http://download.eclipse.org/modeling/emft/eef/updates/milestones/1.5/S201412231052"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.emf.compare.feature.group" version="2.1.2.201310031412"/>
diff --git a/releng/org.eclipse.sirius.targets/sirius_tests_kepler.target b/releng/org.eclipse.sirius.targets/sirius_tests_kepler.target
index c19e764253..2479560a3a 100644
--- a/releng/org.eclipse.sirius.targets/sirius_tests_kepler.target
+++ b/releng/org.eclipse.sirius.targets/sirius_tests_kepler.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="sirius_tests_kepler" sequenceNumber="1430754886">
+<target name="sirius_tests_kepler" sequenceNumber="1431329321">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.acceleo.doc.feature.group" version="3.4.1.201309031307"/>
@@ -13,8 +13,8 @@
       <repository id="Acceleo-3_4" location="http://download.eclipse.org/acceleo/updates/releases/3.4/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.emf.eef.runtime-feature.feature.group" version="1.2.2.201309121245"/>
-      <repository id="EEF-1_2" location="http://download.eclipse.org/modeling/emft/eef/updates/releases/1.2"/>
+      <unit id="org.eclipse.emf.eef.runtime-feature.feature.group" version="1.5.0.201412231052"/>
+      <repository id="EEF-1_5" location="http://download.eclipse.org/modeling/emft/eef/updates/milestones/1.5/S201412231052"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.emf.compare.feature.group" version="2.1.2.201310031412"/>
diff --git a/releng/org.eclipse.sirius.targets/sirius_tests_luna.target b/releng/org.eclipse.sirius.targets/sirius_tests_luna.target
index c0a3a55016..4b748c38c2 100644
--- a/releng/org.eclipse.sirius.targets/sirius_tests_luna.target
+++ b/releng/org.eclipse.sirius.targets/sirius_tests_luna.target
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="sirius_tests_luna" sequenceNumber="1430754888">
+<target name="sirius_tests_luna" sequenceNumber="1431329296">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.eef.runtime-feature.feature.group" version="1.5.0.201412231052"/>
+      <repository id="EEF-1_5" location="http://download.eclipse.org/modeling/emft/eef/updates/milestones/1.5/S201412231052"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
       <unit id="org.easymock" version="2.4.0.v20090202-0900"/>
       <unit id="org.hamcrest.core" version="1.3.0.v201303031735"/>
@@ -60,7 +64,6 @@
       <unit id="org.eclipse.emf.compare.feature.group" version="3.0.2.201501201328"/>
       <unit id="org.eclipse.emf.ecore.feature.group" version="2.10.2.v20150123-0348"/>
       <unit id="org.eclipse.emf.edit.feature.group" version="2.10.1.v20150123-0452"/>
-      <unit id="org.eclipse.emf.eef.runtime" version="1.3.0.201311221533"/>
       <unit id="org.eclipse.emf.feature.group" version="2.10.2.v20150123-0452"/>
       <unit id="org.eclipse.emf.sdk.feature.group" version="2.10.2.v20150123-0452"/>
       <unit id="org.eclipse.emf.transaction.feature.group" version="1.8.0.201405281451"/>