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

14 files changed, 17 insertions, 17 deletions

diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/plugin.xml b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/plugin.xml
index 73b22f1d0bf..6e3217f75cd 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/plugin.xml
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.xtext/plugin.xml
@@ -9,7 +9,7 @@
       </editor>
    </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/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF
index ebfcd8d0b30..b1f31db1867 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ Export-Package: org.eclipse.papyrus.uml.properties.constraints,
  org.eclipse.papyrus.uml.properties.util,
  org.eclipse.papyrus.uml.properties.widgets
 Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.papyrus.views.properties.model;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.properties;bundle-version="1.2.0",
  org.eclipse.papyrus.views.properties;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
  org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/plugin.xml b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/plugin.xml
index a53b2901f09..99b4ee6dd1d 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/plugin.xml
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/plugin.xml
@@ -4,11 +4,11 @@
 <plugin>
    <extension-point id="org.eclipse.papyrus.uml.properties.languageEditor" name="%extension-point.name" schema="schema/org.eclipse.papyrus.uml.properties.languageEditor.exsd"/>
    <extension-point id="org.eclipse.papyrus.uml.properties.datatype" name="DataType" schema="schema/org.eclipse.papyrus.uml.properties.datatype.exsd"/>
-   <extension point="org.eclipse.papyrus.views.properties.environment">
+   <extension point="org.eclipse.papyrus.infra.properties.environments">
       <environment environmentModel="Model/Environment.xmi">
       </environment>
    </extension>
-   <extension point="org.eclipse.papyrus.views.properties.context">
+   <extension point="org.eclipse.papyrus.infra.properties.contexts">
       <context contextModel="Model/UML/UML.ctx">
       </context>
    </extension>
@@ -38,7 +38,7 @@
          <editor editor="org.eclipse.papyrus.uml.properties.widgets.NaturalLanguageEditor" language="Natural language">
          </editor>
       </extension>
-      <extension point="org.eclipse.papyrus.views.properties.context">
+      <extension point="org.eclipse.papyrus.infra.properties.contexts">
          <context contextModel="Model/UMLNotation/UMLNotation.ctx">
          </context>
       </extension>
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/CommentModelElementFactory.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/CommentModelElementFactory.java
index 96bed6399dd..bc0a0c718cc 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/CommentModelElementFactory.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/CommentModelElementFactory.java
@@ -15,9 +15,9 @@ package org.eclipse.papyrus.uml.properties.modelelement;
 

 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.uml.tools.utils.UMLUtil;

 import org.eclipse.papyrus.views.properties.Activator;

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

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

 import org.eclipse.uml2.uml.Element;

 

diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/CustomImageModelElementFactory.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/CustomImageModelElementFactory.java
index 33d1e283cb9..ac2c085d43d 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/CustomImageModelElementFactory.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/CustomImageModelElementFactory.java
@@ -15,9 +15,9 @@ package org.eclipse.papyrus.uml.properties.modelelement;
 

 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.uml.properties.Activator;

 import org.eclipse.papyrus.uml.tools.utils.UMLUtil;

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

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

 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.Image;

diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/ImportedPackageModelElementFactory.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/ImportedPackageModelElementFactory.java
index 2777c5bc0ef..14099b88a41 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/ImportedPackageModelElementFactory.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/ImportedPackageModelElementFactory.java
@@ -14,9 +14,9 @@ package org.eclipse.papyrus.uml.properties.modelelement;
 
 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.uml.tools.utils.UMLUtil;
 import org.eclipse.papyrus.views.properties.Activator;
-import org.eclipse.papyrus.views.properties.contexts.DataContextElement;
 import org.eclipse.papyrus.views.properties.modelelement.EMFModelElementFactory;
 import org.eclipse.uml2.uml.Element;
 
@@ -40,7 +40,7 @@ public class ImportedPackageModelElementFactory extends EMFModelElementFactory {
 	 * @param context
 	 *            the context
 	 * @return the imported package model element
-	 * @see org.eclipse.papyrus.views.properties.modelelement.EMFModelElementFactory#doCreateFromSource(java.lang.Object, org.eclipse.papyrus.views.properties.contexts.DataContextElement)
+	 * @see org.eclipse.papyrus.views.properties.modelelement.EMFModelElementFactory#doCreateFromSource(java.lang.Object, org.eclipse.papyrus.infra.properties.contexts.DataContextElement)
 	 */
 	@Override
 	protected ImportedPackageModelElement doCreateFromSource(Object source, DataContextElement context) {
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/ProfileDefinitionModelElementFactory.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/ProfileDefinitionModelElementFactory.java
index 674a8bed80b..673840492d1 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/ProfileDefinitionModelElementFactory.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/ProfileDefinitionModelElementFactory.java
@@ -13,9 +13,9 @@
  *****************************************************************************/

 package org.eclipse.papyrus.uml.properties.modelelement;

 

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

 import org.eclipse.papyrus.uml.tools.utils.UMLUtil;

 import org.eclipse.papyrus.views.properties.Activator;

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

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

 import org.eclipse.uml2.uml.Element;

 import org.eclipse.uml2.uml.Profile;

diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/StereotypeAppearanceFactory.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/StereotypeAppearanceFactory.java
index 7b478bfb294..9be2f66c70a 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/StereotypeAppearanceFactory.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/StereotypeAppearanceFactory.java
@@ -17,9 +17,9 @@ import org.eclipse.emf.ecore.EModelElement;
 import org.eclipse.emf.edit.domain.EditingDomain;

 import org.eclipse.gef.EditPart;

 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

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

 import org.eclipse.papyrus.uml.tools.utils.UMLUtil;

 import org.eclipse.papyrus.views.properties.Activator;

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

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

 import org.eclipse.uml2.uml.Element;

 

diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/StereotypeApplicationFactory.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/StereotypeApplicationFactory.java
index b469a96307f..823ec7e3bfc 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/StereotypeApplicationFactory.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/StereotypeApplicationFactory.java
@@ -16,9 +16,9 @@ package org.eclipse.papyrus.uml.properties.modelelement;
 import org.eclipse.emf.edit.domain.EditingDomain;

 import org.eclipse.gef.EditPart;

 import org.eclipse.papyrus.infra.emf.utils.EMFHelper;

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

 import org.eclipse.papyrus.uml.tools.utils.UMLUtil;

 import org.eclipse.papyrus.views.properties.Activator;

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

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

 import org.eclipse.uml2.uml.Element;

 

diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/StereotypeModelElementFactory.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/StereotypeModelElementFactory.java
index 0139de745c4..05dadb83c0b 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/StereotypeModelElementFactory.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/StereotypeModelElementFactory.java
@@ -17,9 +17,9 @@ package org.eclipse.papyrus.uml.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.uml.properties.Activator;

 import org.eclipse.papyrus.uml.tools.utils.UMLUtil;

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

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

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

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

diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLEditorFactory.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLEditorFactory.java
index 474507b3e0b..107b529f23c 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLEditorFactory.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLEditorFactory.java
@@ -16,8 +16,8 @@ package org.eclipse.papyrus.uml.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.uml.properties.Activator;

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

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

 

 /**

diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLModelElementFactory.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLModelElementFactory.java
index 6b040204bbe..d99b238376f 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLModelElementFactory.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLModelElementFactory.java
@@ -15,9 +15,9 @@ package org.eclipse.papyrus.uml.properties.modelelement;
 

 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.uml.tools.utils.UMLUtil;

 import org.eclipse.papyrus.views.properties.Activator;

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

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

 import org.eclipse.uml2.uml.Element;

 

diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLNotationFactory.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLNotationFactory.java
index 6defb9992e6..4cd5a66452f 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLNotationFactory.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/modelelement/UMLNotationFactory.java
@@ -14,7 +14,7 @@
 package org.eclipse.papyrus.uml.properties.modelelement;

 

 import org.eclipse.gef.EditPart;

-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/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/NattablePropertyEditor.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/NattablePropertyEditor.java
index 4de832360c1..1c2813a9f6e 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/NattablePropertyEditor.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/NattablePropertyEditor.java
@@ -48,9 +48,9 @@ import org.eclipse.papyrus.infra.nattable.tree.ITreeItemAxisHelper;
 import org.eclipse.papyrus.infra.nattable.utils.HeaderAxisConfigurationManagementUtils;
 import org.eclipse.papyrus.infra.nattable.utils.NattableModelManagerFactory;
 import org.eclipse.papyrus.infra.nattable.utils.TableHelper;
+import org.eclipse.papyrus.infra.properties.contexts.Property;
 import org.eclipse.papyrus.uml.properties.Activator;
 import org.eclipse.papyrus.uml.properties.modelelement.UMLNotationModelElement;
-import org.eclipse.papyrus.views.properties.contexts.Property;
 import org.eclipse.papyrus.views.properties.modelelement.CompositeModelElement;
 import org.eclipse.papyrus.views.properties.modelelement.DataSource;
 import org.eclipse.papyrus.views.properties.modelelement.DataSourceChangedEvent;