Bug 485220: [Architecture] Provide a more modular architecture (& builds) for Papyrus

https://bugs.eclipse.org/bugs/show_bug.cgi?id=485220

Refactor the Properties Model bundles into the Infra Layer.

The *.views.properties.model[.edit,.editor] bundles are renamed as
*.infra.properties[.edit,.editor].  The packages within are
correspondingly renamed.  To support upgrade installation, special p2
update metadata tells the p2 engine how these bundles have been renamed,
ensuring proper replacement of the old *.views.properties.model* bundles,
because otherwise the clash of EMF model registrations would cause
run-time errors.

The *.views.properties.environment extension point is moved to
*.infra.properties.environments.

The *.views.properties.context extension point has the <context>
element moved to a new *.infra.properties.contexts point.  The
<preferencePageBinding> element remains.

JUnit tests pass, at least inasmuch as they pass in the nightly builds.

Change-Id: I6445808f8eb1144b08c0cd5f0a487d1bad229a4c

24 files changed, 32 insertions, 29 deletions

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/META-INF/MANIFEST.MF
index bbc7812306d..ece79d60fc2 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Export-Package: org.eclipse.papyrus.infra.gmfdiag.css.properties.creation,
 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

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

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

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

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

  org.eclipse.emf.edit;bundle-version="2.8.0",

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

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/plugin.xml b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/plugin.xml
index dabd3c96f79..266441657ea 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/plugin.xml
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/plugin.xml
@@ -2,13 +2,13 @@
 <?eclipse version="3.4"?>
 <plugin>
    <extension
-         point="org.eclipse.papyrus.views.properties.context">
+         point="org.eclipse.papyrus.infra.properties.contexts">
       <context
             contextModel="model/properties/css.ctx">
       </context>
    </extension>
    <extension
-         point="org.eclipse.papyrus.views.properties.environment">
+         point="org.eclipse.papyrus.infra.properties.environments">
       <environment
             environmentModel="model/Environment.xmi">
       </environment>
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/modelelement/CSSModelElement.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/modelelement/CSSModelElement.java
index 7c59a7a3920..73818b6f88a 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/modelelement/CSSModelElement.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/modelelement/CSSModelElement.java
@@ -33,10 +33,10 @@ import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.ModelStyleSheets;
 import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StylesheetsFactory;

 import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StylesheetsPackage;

 import org.eclipse.papyrus.infra.gmfdiag.properties.modelelement.CustomStyleModelElement;

+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;

 import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;

 import org.eclipse.papyrus.infra.widgets.creation.StringEditionFactory;

 import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;

-import org.eclipse.papyrus.views.properties.contexts.DataContextElement;

 

 public class CSSModelElement extends CustomStyleModelElement {

 

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/modelelement/CSSModelElementFactory.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/modelelement/CSSModelElementFactory.java
index fb390b26fc7..b0b432daa46 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/modelelement/CSSModelElementFactory.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/modelelement/CSSModelElementFactory.java
@@ -20,7 +20,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.helper.NotationHelper;
 import org.eclipse.papyrus.infra.gmfdiag.css.properties.Activator;

 import org.eclipse.papyrus.infra.gmfdiag.properties.modelelement.CustomStyleModelElement;

 import org.eclipse.papyrus.infra.gmfdiag.properties.modelelement.CustomStyleModelElementFactory;

-import org.eclipse.papyrus.views.properties.contexts.DataContextElement;

+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;

 

 

 public class CSSModelElementFactory extends CustomStyleModelElementFactory {

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/modelelement/CSSPreferencesModelElement.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/modelelement/CSSPreferencesModelElement.java
index e9116c86ac1..818b236c1db 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/modelelement/CSSPreferencesModelElement.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/modelelement/CSSPreferencesModelElement.java
@@ -14,7 +14,7 @@ package org.eclipse.papyrus.infra.gmfdiag.css.properties.modelelement;
 import org.eclipse.jface.viewers.ILabelProvider;

 import org.eclipse.papyrus.infra.gmfdiag.css.preferences.ThemePreferences;

 import org.eclipse.papyrus.infra.gmfdiag.css.properties.provider.CSSThemeLabelProvider;

-import org.eclipse.papyrus.views.properties.contexts.DataContextElement;

+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;

 import org.eclipse.papyrus.views.properties.modelelement.PreferencesModelElement;

 

 

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/modelelement/CSSPreferencesModelElementFactory.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/modelelement/CSSPreferencesModelElementFactory.java
index 8e040337f43..76bf00b0eb6 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/modelelement/CSSPreferencesModelElementFactory.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/modelelement/CSSPreferencesModelElementFactory.java
@@ -13,7 +13,7 @@
  *****************************************************************************/

 package org.eclipse.papyrus.infra.gmfdiag.css.properties.modelelement;

 

-import org.eclipse.papyrus.views.properties.contexts.DataContextElement;

+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;

 import org.eclipse.papyrus.views.properties.modelelement.PreferencesModelElement;

 import org.eclipse.papyrus.views.properties.modelelement.PreferencesModelElementFactory;

 

diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/modelelement/CSSThemesModelElementFactory.java b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/modelelement/CSSThemesModelElementFactory.java
index 4abe36d1f72..71d3c44b370 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/modelelement/CSSThemesModelElementFactory.java
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.properties/src/org/eclipse/papyrus/infra/gmfdiag/css/properties/modelelement/CSSThemesModelElementFactory.java
@@ -17,8 +17,8 @@ package org.eclipse.papyrus.infra.gmfdiag.css.properties.modelelement;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;
 import org.eclipse.papyrus.views.properties.Activator;
-import org.eclipse.papyrus.views.properties.contexts.DataContextElement;
 import org.eclipse.papyrus.views.properties.modelelement.AbstractEMFModelElementFactory;
 
 
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF
index fc6af26fe5d..63ab1796743 100644
--- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF
@@ -39,7 +39,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0",

  org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0",

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

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

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

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

  com.google.guava;bundle-version="11.0.0",

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

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF
index 36f585befda..f5658f055dc 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Export-Package: org.eclipse.papyrus.infra.gmfdiag.properties.extension,
 Require-Bundle: org.eclipse.ui,

  org.eclipse.core.runtime,

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

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

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

  org.eclipse.gmf.runtime.notation;bundle-version="1.4.1",

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

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

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/plugin.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/plugin.xml
index 7fae26889a7..97284af4aa8 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/plugin.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/plugin.xml
@@ -3,7 +3,7 @@
 <plugin>

    <extension-point id="stylehandler" name="StyleHandler" schema="schema/stylehandler.exsd"/>

    <extension

-         point="org.eclipse.papyrus.views.properties.context">

+         point="org.eclipse.papyrus.infra.properties.contexts">

       <context

             contextModel="model/style/style.ctx">

       </context>

@@ -15,7 +15,7 @@
       </context>

    </extension>

    <extension

-         point="org.eclipse.papyrus.views.properties.environment">

+         point="org.eclipse.papyrus.infra.properties.environments">

       <environment

             environmentModel="model/Environment.xmi">

       </environment>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/extension/NotationStyleHandlerProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/extension/NotationStyleHandlerProvider.java
index 926b3307c02..2344dc4b223 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/extension/NotationStyleHandlerProvider.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/extension/NotationStyleHandlerProvider.java
@@ -17,7 +17,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.helper.NotationHelper;
 import org.eclipse.papyrus.infra.gmfdiag.properties.constraint.GMFNotationConstraint;

 import org.eclipse.papyrus.infra.gmfdiag.properties.modelelement.NotationModelElementFactory;

 import org.eclipse.papyrus.infra.gmfdiag.properties.modelelement.StyleHandlerProvider;

-import org.eclipse.papyrus.views.properties.contexts.DataContextElement;

+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;

 import org.eclipse.papyrus.views.properties.modelelement.ModelElement;

 import org.eclipse.papyrus.views.properties.modelelement.ModelElementFactory;

 

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/AppearanceModelElementFactory.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/AppearanceModelElementFactory.java
index 878ec9fd261..0a11c132beb 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/AppearanceModelElementFactory.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/AppearanceModelElementFactory.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.infra.gmfdiag.properties.modelelement;
 

 import org.eclipse.papyrus.infra.gmfdiag.properties.Activator;

 import org.eclipse.papyrus.infra.gmfdiag.properties.extension.StyleHandlerManager;

-import org.eclipse.papyrus.views.properties.contexts.DataContextElement;

+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;

 import org.eclipse.papyrus.views.properties.modelelement.ModelElement;

 import org.eclipse.papyrus.views.properties.modelelement.ModelElementFactory;

 

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/CustomStyleModelElement.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/CustomStyleModelElement.java
index 2f8b01ec06e..8c6cb123a05 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/CustomStyleModelElement.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/CustomStyleModelElement.java
@@ -26,12 +26,12 @@ import org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom.CustomIntStyl
 import org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom.CustomIntStyleObservableValue;

 import org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom.CustomStringStyleObservableList;

 import org.eclipse.papyrus.infra.gmfdiag.common.databinding.custom.CustomStringStyleObservableValue;

+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;

+import org.eclipse.papyrus.infra.properties.contexts.Property;

+import org.eclipse.papyrus.infra.properties.environment.Type;

 import org.eclipse.papyrus.infra.widgets.creation.ReferenceValueFactory;

 import org.eclipse.papyrus.infra.widgets.creation.StringEditionFactory;

 import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;

-import org.eclipse.papyrus.views.properties.contexts.DataContextElement;

-import org.eclipse.papyrus.views.properties.contexts.Property;

-import org.eclipse.papyrus.views.properties.environment.Type;

 import org.eclipse.papyrus.views.properties.modelelement.EMFModelElement;

 

 

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/CustomStyleModelElementFactory.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/CustomStyleModelElementFactory.java
index fbe32d88ed5..ba79180cb05 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/CustomStyleModelElementFactory.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/CustomStyleModelElementFactory.java
@@ -19,7 +19,7 @@ import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.gmf.runtime.notation.View;

 import org.eclipse.papyrus.infra.gmfdiag.common.helper.NotationHelper;

 import org.eclipse.papyrus.infra.gmfdiag.properties.Activator;

-import org.eclipse.papyrus.views.properties.contexts.DataContextElement;

+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;

 import org.eclipse.papyrus.views.properties.modelelement.AbstractEMFModelElementFactory;

 

 

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/DecoratedModelElementFactory.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/DecoratedModelElementFactory.java
index 63a15b79b46..48f2685b328 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/DecoratedModelElementFactory.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/DecoratedModelElementFactory.java
@@ -20,7 +20,7 @@ import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.infra.gmfdiag.common.helper.NotationHelper;

 import org.eclipse.papyrus.infra.gmfdiag.common.providers.ShapeDecorator;

 import org.eclipse.papyrus.infra.gmfdiag.properties.Activator;

-import org.eclipse.papyrus.views.properties.contexts.DataContextElement;

+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;

 import org.eclipse.papyrus.views.properties.modelelement.AbstractModelElementFactory;

 

 /**

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/NotationModelElementFactory.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/NotationModelElementFactory.java
index 992fcb22e21..01e1782388e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/NotationModelElementFactory.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/NotationModelElementFactory.java
@@ -21,7 +21,7 @@ import org.eclipse.gmf.runtime.notation.datatype.GradientData;
 import org.eclipse.papyrus.infra.gmfdiag.common.helper.NotationHelper;

 import org.eclipse.papyrus.infra.gmfdiag.properties.Activator;

 import org.eclipse.papyrus.infra.gmfdiag.properties.databinding.ObservableGradientData;

-import org.eclipse.papyrus.views.properties.contexts.DataContextElement;

+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;

 import org.eclipse.papyrus.views.properties.modelelement.AbstractEMFModelElementFactory;

 import org.eclipse.papyrus.views.properties.modelelement.AbstractModelElement;

 import org.eclipse.papyrus.views.properties.modelelement.AbstractModelElementFactory;

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/RulerAndGridModelElement.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/RulerAndGridModelElement.java
index 3d99d477673..e6b602b366b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/RulerAndGridModelElement.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/RulerAndGridModelElement.java
@@ -29,9 +29,9 @@ import org.eclipse.papyrus.infra.gmfdiag.properties.databinding.DoubleDiagramVie
 import org.eclipse.papyrus.infra.gmfdiag.properties.databinding.IntegerDiagramViewObservableValue;

 import org.eclipse.papyrus.infra.gmfdiag.properties.databinding.RulersUnitObservableValue;

 import org.eclipse.papyrus.infra.gmfdiag.properties.util.RulersAndGridPropertyConstants;

+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;

 import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider;

 import org.eclipse.papyrus.infra.widgets.providers.StaticContentProvider;

-import org.eclipse.papyrus.views.properties.contexts.DataContextElement;

 import org.eclipse.papyrus.views.properties.modelelement.AbstractModelElement;

 

 /**

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/RulersAndGridModelElementFactory.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/RulersAndGridModelElementFactory.java
index 9f467eca532..1b84e55c05e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/RulersAndGridModelElementFactory.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/RulersAndGridModelElementFactory.java
@@ -23,7 +23,7 @@ import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.papyrus.infra.gmfdiag.common.helper.NotationHelper;

 import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramEditPartsUtil;

 import org.eclipse.papyrus.infra.gmfdiag.properties.Activator;

-import org.eclipse.papyrus.views.properties.contexts.DataContextElement;

+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;

 import org.eclipse.papyrus.views.properties.modelelement.AbstractModelElementFactory;

 

 /**

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/StyleHandlerProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/StyleHandlerProvider.java
index a44665191da..3870ed9daba 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/StyleHandlerProvider.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/StyleHandlerProvider.java
@@ -12,7 +12,7 @@
 package org.eclipse.papyrus.infra.gmfdiag.properties.modelelement;

 

 import org.eclipse.papyrus.infra.constraints.constraints.Constraint;

-import org.eclipse.papyrus.views.properties.contexts.DataContextElement;

+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;

 import org.eclipse.papyrus.views.properties.modelelement.ModelElement;

 

 /**

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/SynchronizationModelElementFactory.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/SynchronizationModelElementFactory.java
index b6fba3be817..762d9c276aa 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/SynchronizationModelElementFactory.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/infra/gmfdiag/properties/modelelement/SynchronizationModelElementFactory.java
@@ -15,7 +15,7 @@ package org.eclipse.papyrus.infra.gmfdiag.properties.modelelement;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
 import org.eclipse.papyrus.infra.core.utils.AdapterUtils;
 import org.eclipse.papyrus.infra.gmfdiag.properties.Activator;
-import org.eclipse.papyrus.views.properties.contexts.DataContextElement;
+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;
 import org.eclipse.papyrus.views.properties.modelelement.AbstractModelElementFactory;
 
 /**
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/META-INF/MANIFEST.MF
index 4efe9316855..caabaa06faa 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/META-INF/MANIFEST.MF
@@ -21,7 +21,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0",
  org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.2.0",
  org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",
  org.eclipse.papyrus.views.properties;bundle-version="1.2.0",
- org.eclipse.papyrus.views.properties.model;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.properties;bundle-version="1.2.0",
  org.eclipse.core.databinding;bundle-version="1.6.0",
  org.eclipse.emf.databinding;bundle-version="1.3.0",
  org.eclipse.jface.databinding;bundle-version="1.8.0",
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/plugin.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/plugin.xml
index e3167433681..cc4669b7fed 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/plugin.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/plugin.xml
@@ -13,17 +13,20 @@
 -->
 <plugin>
    <extension
-         point="org.eclipse.papyrus.views.properties.context">
+         point="org.eclipse.papyrus.infra.properties.contexts">
       <context
             contextModel="model/diagrams/diagrams.ctx">
       </context>
+   </extension>
+   <extension
+         point="org.eclipse.papyrus.views.properties.context">
       <preferencePageBinding
             context="welcome-diagrams"
             page="org.eclipse.papyrus.infra.editor.welcome.content">
       </preferencePageBinding>
    </extension>
    <extension
-         point="org.eclipse.papyrus.views.properties.environment">
+         point="org.eclipse.papyrus.infra.properties.environments">
       <environment
             environmentModel="model/environment.xmi">
       </environment>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/src/org/eclipse/papyrus/infra/gmfdiag/welcome/internal/modelelements/WelcomeModelElementFactory.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/src/org/eclipse/papyrus/infra/gmfdiag/welcome/internal/modelelements/WelcomeModelElementFactory.java
index 5592680cfe8..5d5db0da477 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/src/org/eclipse/papyrus/infra/gmfdiag/welcome/internal/modelelements/WelcomeModelElementFactory.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/src/org/eclipse/papyrus/infra/gmfdiag/welcome/internal/modelelements/WelcomeModelElementFactory.java
@@ -16,8 +16,8 @@ package org.eclipse.papyrus.infra.gmfdiag.welcome.internal.modelelements;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;
 import org.eclipse.papyrus.views.properties.Activator;
-import org.eclipse.papyrus.views.properties.contexts.DataContextElement;
 import org.eclipse.papyrus.views.properties.modelelement.AbstractEMFModelElementFactory;
 
 /**
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/plugin.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/plugin.xml
index b9576d2ff94..0fbbdda97eb 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/plugin.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/plugin.xml
@@ -2,7 +2,7 @@
 <?eclipse version="3.4"?>

 <plugin>

    <extension

-         point="org.eclipse.papyrus.views.properties.environment">

+         point="org.eclipse.papyrus.infra.properties.environments">

       <environment

             environmentModel="model/Environment.xmi">

       </environment>