362162: [Architecture - Refactoring] The plug-ins should be renamed to match their layer's qualified name

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

32 files changed, 68 insertions, 68 deletions

diff --git a/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/Customization.ctx b/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/Customization.ctx
index 33a93f784be..bb691043108 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/Customization.ctx
+++ b/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/Customization.ctx
@@ -58,126 +58,126 @@
   </tabs>

   <views name="Single CustomizationConfiguration" sections="//@tabs.0/@sections.0" automaticContext="true" datacontexts="//@dataContexts.0/@elements.0">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleCustomizationConfiguration">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="CustomizationConfiguration"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/customization"/>

     </constraints>

   </views>

   <views name="Single CustomizableElement" sections="//@tabs.0/@sections.1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.1">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleCustomizableElement">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/customization"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="CustomizableElement"/>

     </constraints>

   </views>

   <views name="Single FileBasedCustomizableElement" sections="//@tabs.0/@sections.2" automaticContext="true" datacontexts="//@dataContexts.0/@elements.2">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleFileBasedCustomizableElement">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="FileBasedCustomizableElement"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/customization"/>

     </constraints>

   </views>

   <views name="Single PropertyView" sections="//@tabs.0/@sections.3" automaticContext="true" datacontexts="//@dataContexts.0/@elements.3">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSinglePropertyView">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/customization"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="PropertyView"/>

     </constraints>

   </views>

   <views name="Single UICustom" sections="//@tabs.0/@sections.4" automaticContext="true" datacontexts="//@dataContexts.0/@elements.4">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleUICustom">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="UICustom"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/customization"/>

     </constraints>

   </views>

   <views name="Single ModelTemplate" sections="//@tabs.0/@sections.5" automaticContext="true" datacontexts="//@dataContexts.0/@elements.5">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleModelTemplate">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/customization"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="ModelTemplate"/>

     </constraints>

   </views>

   <views name="Single Palette" sections="//@tabs.0/@sections.6" automaticContext="true" datacontexts="//@dataContexts.0/@elements.6">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSinglePalette">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/customization"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="Palette"/>

     </constraints>

   </views>

   <views name="Single Profile" sections="//@tabs.0/@sections.7" automaticContext="true" datacontexts="//@dataContexts.0/@elements.7">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleProfile">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="Profile"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/customization"/>

     </constraints>

   </views>

   <views name="Single UMLModel" sections="//@tabs.0/@sections.8" automaticContext="true" datacontexts="//@dataContexts.0/@elements.8">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleUMLModel">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/customization"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="UMLModel"/>

     </constraints>

   </views>

   <views name="Multiple CustomizationConfiguration" sections="//@tabs.0/@sections.9" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.0">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleCustomizationConfiguration">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="CustomizationConfiguration"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/customization"/>

     </constraints>

   </views>

   <views name="Multiple CustomizableElement" sections="//@tabs.0/@sections.10" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.1">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleCustomizableElement">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="CustomizableElement"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/customization"/>

     </constraints>

   </views>

   <views name="Multiple FileBasedCustomizableElement" sections="//@tabs.0/@sections.11" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.2">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleFileBasedCustomizableElement">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/customization"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="FileBasedCustomizableElement"/>

     </constraints>

   </views>

   <views name="Multiple PropertyView" sections="//@tabs.0/@sections.12" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.3">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultiplePropertyView">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/customization"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="PropertyView"/>

     </constraints>

   </views>

   <views name="Multiple UICustom" sections="//@tabs.0/@sections.13" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.4">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleUICustom">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="UICustom"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/customization"/>

     </constraints>

   </views>

   <views name="Multiple ModelTemplate" sections="//@tabs.0/@sections.14" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.5">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleModelTemplate">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/customization"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="ModelTemplate"/>

     </constraints>

   </views>

   <views name="Multiple Palette" sections="//@tabs.0/@sections.15" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.6">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultiplePalette">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/customization"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="Palette"/>

     </constraints>

   </views>

   <views name="Multiple Profile" sections="//@tabs.0/@sections.16" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.7">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleProfile">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/customization"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="Profile"/>

     </constraints>

   </views>

   <views name="Multiple UMLModel" sections="//@tabs.0/@sections.17" elementMultiplicity="-1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.8">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleUMLModel">

-      <constraintType href="ppe:/environment/org.eclipse.papyrus.properties/model/Environment.xmi#//@constraintTypes.0"/>

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.views.properties/model/Environment.xmi#//@constraintTypes.0"/>

       <properties xsi:type="contexts:ValueProperty" name="className" value="UMLModel"/>

       <properties xsi:type="contexts:ValueProperty" name="nsUri" value="http://www.eclipse.org/papyrus/customization"/>

     </constraints>

diff --git a/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/MultipleCustomizableElement.xwt b/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/MultipleCustomizableElement.xwt
index 16c43716496..a4b19afc6c9 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/MultipleCustomizableElement.xwt
+++ b/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/MultipleCustomizableElement.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/MultipleCustomizationConfiguration.xwt b/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/MultipleCustomizationConfiguration.xwt
index 16c43716496..a4b19afc6c9 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/MultipleCustomizationConfiguration.xwt
+++ b/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/MultipleCustomizationConfiguration.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/MultipleFileBasedCustomizableElement.xwt b/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/MultipleFileBasedCustomizableElement.xwt
index 16c43716496..a4b19afc6c9 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/MultipleFileBasedCustomizableElement.xwt
+++ b/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/MultipleFileBasedCustomizableElement.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/MultipleModelTemplate.xwt b/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/MultipleModelTemplate.xwt
index da91024e548..ab24a483eee 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/MultipleModelTemplate.xwt
+++ b/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/MultipleModelTemplate.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="customization:ModelTemplate:language"></ppe:StringEditor></Composite></Composite>
\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="customization:ModelTemplate:language"></ppe:StringEditor></Composite></Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/MultiplePalette.xwt b/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/MultiplePalette.xwt
index 9fb0660fabb..d60da95e3ca 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/MultiplePalette.xwt
+++ b/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/MultiplePalette.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><Label text="This element is not available yet"></Label></Composite>
\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><Label text="This element is not available yet"></Label></Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/MultipleProfile.xwt b/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/MultipleProfile.xwt
index 42fea4858f8..c7b1974deb6 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/MultipleProfile.xwt
+++ b/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/MultipleProfile.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="customization:Profile:provider"></ppe:StringEditor></Composite></Composite>
\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="customization:Profile:provider"></ppe:StringEditor></Composite></Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/MultiplePropertyView.xwt b/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/MultiplePropertyView.xwt
index 16c43716496..a4b19afc6c9 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/MultiplePropertyView.xwt
+++ b/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/MultiplePropertyView.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/MultipleUICustom.xwt b/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/MultipleUICustom.xwt
index e1c79c10310..aac13e8ffca 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/MultipleUICustom.xwt
+++ b/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/MultipleUICustom.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout">

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/MultipleUMLModel.xwt b/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/MultipleUMLModel.xwt
index f55c0329b9a..a7289ba59db 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/MultipleUMLModel.xwt
+++ b/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/MultipleUMLModel.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="customization:UMLModel:provider"></ppe:StringEditor></Composite></Composite>
\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:StringEditor input="{Binding}" property="customization:UMLModel:provider"></ppe:StringEditor></Composite></Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/SingleCustomizableElement.xwt b/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/SingleCustomizableElement.xwt
index 16c43716496..a4b19afc6c9 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/SingleCustomizableElement.xwt
+++ b/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/SingleCustomizableElement.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout></Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/SingleCustomizationConfiguration.xwt b/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/SingleCustomizationConfiguration.xwt
index e95effcdca0..318a6db3e75 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/SingleCustomizationConfiguration.xwt
+++ b/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/SingleCustomizationConfiguration.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <Composite xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns="http://www.eclipse.org/xwt/presentation">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/SingleFileBasedCustomizableElement.xwt b/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/SingleFileBasedCustomizableElement.xwt
index 974a31b83dd..adbabf14cef 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/SingleFileBasedCustomizableElement.xwt
+++ b/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/SingleFileBasedCustomizableElement.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:StringFileSelector input="{Binding}" property="customization:FileBasedCustomizableElement:file"></ppe:StringFileSelector></Composite></Composite>
\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:StringFileSelector input="{Binding}" property="customization:FileBasedCustomizableElement:file"></ppe:StringFileSelector></Composite></Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/SingleModelTemplate.xwt b/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/SingleModelTemplate.xwt
index 2d5fa4043c5..dbf929666dc 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/SingleModelTemplate.xwt
+++ b/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/SingleModelTemplate.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:StringFileSelector input="{Binding}" property="customization:FileBasedCustomizableElement:file"></ppe:StringFileSelector><ppe:StringEditor input="{Binding}" property="customization:ModelTemplate:name"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="customization:ModelTemplate:language"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="customization:ModelTemplate:id"></ppe:StringEditor></Composite></Composite>
\ No newline at end of file
+<Composite xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:StringFileSelector input="{Binding}" property="customization:FileBasedCustomizableElement:file"></ppe:StringFileSelector><ppe:StringEditor input="{Binding}" property="customization:ModelTemplate:name"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="customization:ModelTemplate:language"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="customization:ModelTemplate:id"></ppe:StringEditor></Composite></Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/SinglePalette.xwt b/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/SinglePalette.xwt
index 7b87e553372..11078861781 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/SinglePalette.xwt
+++ b/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/SinglePalette.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Label text="This element is not available yet"></Label></Composite>
\ No newline at end of file
+<Composite xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Label text="This element is not available yet"></Label></Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/SingleProfile.xwt b/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/SingleProfile.xwt
index 11bbb7866a7..59d93abe02d 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/SingleProfile.xwt
+++ b/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/SingleProfile.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:StringFileSelector input="{Binding}" property="customization:FileBasedCustomizableElement:file"></ppe:StringFileSelector><ppe:StringEditor input="{Binding}" property="customization:Profile:name"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="customization:Profile:description"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="customization:Profile:iconpath"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="customization:Profile:provider"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="customization:Profile:qualifiednames"></ppe:StringEditor></Composite></Composite>
\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns:x="http://www.eclipse.org/xwt"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:StringFileSelector input="{Binding}" property="customization:FileBasedCustomizableElement:file"></ppe:StringFileSelector><ppe:StringEditor input="{Binding}" property="customization:Profile:name"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="customization:Profile:description"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="customization:Profile:iconpath"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="customization:Profile:provider"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="customization:Profile:qualifiednames"></ppe:StringEditor></Composite></Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/SinglePropertyView.xwt b/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/SinglePropertyView.xwt
index 6a525c60b49..3d86f56a533 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/SinglePropertyView.xwt
+++ b/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/SinglePropertyView.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringFileSelector input="{Binding}" property="customization:FileBasedCustomizableElement:file"></ppe:StringFileSelector></Composite>
\ No newline at end of file
+<Composite xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><ppe:StringFileSelector input="{Binding}" property="customization:FileBasedCustomizableElement:file"></ppe:StringFileSelector></Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/SingleUICustom.xwt b/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/SingleUICustom.xwt
index 38877489ce7..20ea479c75e 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/SingleUICustom.xwt
+++ b/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/SingleUICustom.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout"

+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

+	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

 	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/SingleUMLModel.xwt b/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/SingleUMLModel.xwt
index 88fe597762a..848eecd7d01 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/SingleUMLModel.xwt
+++ b/plugins/customization/org.eclipse.papyrus.customization/Model/Customization/ui/SingleUMLModel.xwt
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:StringFileSelector input="{Binding}" property="customization:FileBasedCustomizableElement:file"></ppe:StringFileSelector><ppe:StringEditor input="{Binding}" property="customization:UMLModel:name"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="customization:UMLModel:description"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="customization:UMLModel:iconpath"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="customization:UMLModel:provider"></ppe:StringEditor></Composite></Composite>
\ No newline at end of file
+<Composite xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout" xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"><Composite.layout><ppel:PropertiesLayout></ppel:PropertiesLayout></Composite.layout><Composite><Composite.layout><ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout></Composite.layout><ppe:StringFileSelector input="{Binding}" property="customization:FileBasedCustomizableElement:file"></ppe:StringFileSelector><ppe:StringEditor input="{Binding}" property="customization:UMLModel:name"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="customization:UMLModel:description"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="customization:UMLModel:iconpath"></ppe:StringEditor><ppe:StringEditor input="{Binding}" property="customization:UMLModel:provider"></ppe:StringEditor></Composite></Composite>
\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization/plugin.xml b/plugins/customization/org.eclipse.papyrus.customization/plugin.xml
index 4d118a5cdae..bd7793e0cbb 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/plugin.xml
+++ b/plugins/customization/org.eclipse.papyrus.customization/plugin.xml
@@ -27,14 +27,14 @@
       </wizard>

    </extension>

    <extension

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

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

       <context

             contextModel="Model/Customization/Customization.ctx"

             loadDefault="true">

       </context>

    </extension>

    <extension

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

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

       <environment

             environmentModel="Model/Environment.xmi">

       </environment>

diff --git a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/Activator.java b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/Activator.java
index 13815a43095..6e4d4ff6d9f 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/Activator.java
+++ b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/Activator.java
@@ -11,7 +11,7 @@
  *****************************************************************************/

 package org.eclipse.papyrus.customization;

 

-import org.eclipse.papyrus.log.LogHelper;

+import org.eclipse.papyrus.infra.core.log.LogHelper;

 import org.eclipse.ui.plugin.AbstractUIPlugin;

 import org.osgi.framework.BundleContext;

 

diff --git a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/creation/CustomizationElementCreationFactory.java b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/creation/CustomizationElementCreationFactory.java
index 07bd3b4d5e4..5ecbd4a873c 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/creation/CustomizationElementCreationFactory.java
+++ b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/creation/CustomizationElementCreationFactory.java
@@ -7,7 +7,7 @@ import org.eclipse.papyrus.customization.model.customization.CustomizationPackag
 import org.eclipse.papyrus.customization.model.customization.Profile;

 import org.eclipse.papyrus.customization.model.customization.UMLModel;

 import org.eclipse.papyrus.customization.wizard.CreateNewCustomizationPluginWizard;

-import org.eclipse.papyrus.properties.creation.EcorePropertyEditorFactory;

+import org.eclipse.papyrus.views.properties.creation.EcorePropertyEditorFactory;

 import org.eclipse.swt.widgets.Control;

 

 

diff --git a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/display/DisplayManager.java b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/display/DisplayManager.java
index f7ca3dc2cc2..32d8f05c598 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/display/DisplayManager.java
+++ b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/display/DisplayManager.java
@@ -1,7 +1,7 @@
 package org.eclipse.papyrus.customization.display;

 

-import org.eclipse.papyrus.properties.runtime.ConfigurationManager;

-import org.eclipse.papyrus.properties.runtime.ConstraintEngine;

+import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager;

+import org.eclipse.papyrus.views.properties.runtime.ConstraintEngine;

 

 

 public class DisplayManager {

diff --git a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/EnvironmentExtensionFactory.java b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/EnvironmentExtensionFactory.java
index 05ce8b71d87..4b9ba0a6178 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/EnvironmentExtensionFactory.java
+++ b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/EnvironmentExtensionFactory.java
@@ -20,14 +20,14 @@ import org.eclipse.papyrus.customization.plugin.PluginEditor;
 public class EnvironmentExtensionFactory extends FileBasedExtensionFactory {

 

 	public EnvironmentExtensionFactory() {

-		super(Messages.EnvironmentExtensionFactory_PropertyViewEnvironment, "org.eclipse.papyrus.properties.Environment", "environmentModel", "environment", true); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 

+		super(Messages.EnvironmentExtensionFactory_PropertyViewEnvironment, "org.eclipse.papyrus.views.properties.Environment", "environmentModel", "environment", true); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 

 	}

 

 	@Override

 	public void addElement(CustomizableElement element, PluginEditor editor) {

 		super.addElement(element, editor);

 

-		editor.getManifestEditor().addDependency("org.eclipse.papyrus.properties"); //$NON-NLS-1$

+		editor.getManifestEditor().addDependency("org.eclipse.papyrus.views.properties"); //$NON-NLS-1$

 	}

 

 	@Override

diff --git a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/FileBasedExtensionFactory.java b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/FileBasedExtensionFactory.java
index d4ed0dedfb9..e7667ecece6 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/FileBasedExtensionFactory.java
+++ b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/FileBasedExtensionFactory.java
@@ -22,7 +22,7 @@ import org.eclipse.papyrus.customization.Activator;
 import org.eclipse.papyrus.customization.model.customization.CustomizableElement;

 import org.eclipse.papyrus.customization.model.customization.FileBasedCustomizableElement;

 import org.eclipse.papyrus.customization.plugin.PluginEditor;

-import org.eclipse.papyrus.widgets.util.FileUtil;

+import org.eclipse.papyrus.infra.widgets.util.FileUtil;

 import org.w3c.dom.Element;

 

 

diff --git a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/ProfileExtensionFactory.java b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/ProfileExtensionFactory.java
index e69bc84e3a3..455f053edd6 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/ProfileExtensionFactory.java
+++ b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/ProfileExtensionFactory.java
@@ -21,7 +21,7 @@ import org.eclipse.papyrus.customization.model.customization.CustomizableElement
 import org.eclipse.papyrus.customization.model.customization.FileBasedCustomizableElement;

 import org.eclipse.papyrus.customization.model.customization.Profile;

 import org.eclipse.papyrus.customization.plugin.PluginEditor;

-import org.eclipse.papyrus.widgets.util.FileUtil;

+import org.eclipse.papyrus.infra.widgets.util.FileUtil;

 import org.w3c.dom.Element;

 

 

diff --git a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/PropertyViewExtensionFactory.java b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/PropertyViewExtensionFactory.java
index 0c7245f1227..3629012b636 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/PropertyViewExtensionFactory.java
+++ b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/PropertyViewExtensionFactory.java
@@ -32,9 +32,9 @@ import org.eclipse.papyrus.customization.messages.Messages;
 import org.eclipse.papyrus.customization.model.customization.CustomizableElement;

 import org.eclipse.papyrus.customization.model.customization.FileBasedCustomizableElement;

 import org.eclipse.papyrus.customization.plugin.PluginEditor;

-import org.eclipse.papyrus.properties.contexts.Context;

-import org.eclipse.papyrus.properties.util.EMFHelper;

-import org.eclipse.papyrus.widgets.util.FileUtil;

+import org.eclipse.papyrus.infra.widgets.util.FileUtil;

+import org.eclipse.papyrus.views.properties.contexts.Context;

+import org.eclipse.papyrus.views.properties.util.EMFHelper;

 import org.eclipse.swt.widgets.Display;

 import org.w3c.dom.Element;

 

@@ -44,14 +44,14 @@ public class PropertyViewExtensionFactory extends FileBasedExtensionFactory {
 	protected IStatus result;

 

 	public PropertyViewExtensionFactory() {

-		super(Messages.PropertyViewExtensionFactory_PropertyView, "org.eclipse.papyrus.properties.Context", "contextModel", "context", true); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

+		super(Messages.PropertyViewExtensionFactory_PropertyView, "org.eclipse.papyrus.views.properties.Context", "contextModel", "context", true); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

 	}

 

 	@Override

 	public void addElement(CustomizableElement element, PluginEditor editor) {

 		super.addElement(element, editor);

 

-		editor.getManifestEditor().addDependency("org.eclipse.papyrus.properties"); //$NON-NLS-1$

+		editor.getManifestEditor().addDependency("org.eclipse.papyrus.views.properties"); //$NON-NLS-1$

 	}

 

 	@Override

diff --git a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/modelelement/CustomizationModelElement.java b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/modelelement/CustomizationModelElement.java
index d7e8d0c37de..b4ca933e2ed 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/modelelement/CustomizationModelElement.java
+++ b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/modelelement/CustomizationModelElement.java
@@ -6,8 +6,8 @@ import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.domain.EditingDomain;

 import org.eclipse.papyrus.customization.creation.CustomizationElementCreationFactory;

 import org.eclipse.papyrus.customization.model.customization.CustomizationPackage;

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

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

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

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

 

 

 public class CustomizationModelElement extends EMFModelElement {

diff --git a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/modelelement/CustomizationModelElementFactory.java b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/modelelement/CustomizationModelElementFactory.java
index c2b50e7e79b..adc75df211f 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/modelelement/CustomizationModelElementFactory.java
+++ b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/modelelement/CustomizationModelElementFactory.java
@@ -3,11 +3,11 @@ package org.eclipse.papyrus.customization.modelelement;
 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

 import org.eclipse.emf.edit.domain.EditingDomain;

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

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

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

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

-import org.eclipse.papyrus.properties.util.EMFHelper;

+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.papyrus.views.properties.modelelement.ModelElement;

+import org.eclipse.papyrus.views.properties.util.EMFHelper;

 

 

 public class CustomizationModelElementFactory extends EMFModelElementFactory {

diff --git a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/plugin/BuildEditor.java b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/plugin/BuildEditor.java
index a9688d3308c..09743c009cd 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/plugin/BuildEditor.java
+++ b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/plugin/BuildEditor.java
@@ -18,7 +18,7 @@ import java.io.IOException;
 import java.util.Properties;

 

 import org.eclipse.core.resources.IProject;

-import org.eclipse.papyrus.widgets.util.FileUtil;

+import org.eclipse.papyrus.infra.widgets.util.FileUtil;

 

 public class BuildEditor {

 

diff --git a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/wizard/CreateNewCustomizationPluginWizard.java b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/wizard/CreateNewCustomizationPluginWizard.java
index 79ad4f185f8..58806e9a33e 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/wizard/CreateNewCustomizationPluginWizard.java
+++ b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/wizard/CreateNewCustomizationPluginWizard.java
@@ -38,7 +38,7 @@ public class CreateNewCustomizationPluginWizard extends NewPluginProjectWizard {
 

 	public CreateNewCustomizationPluginWizard() {

 		super();

-		setDefaultPageImageDescriptor(org.eclipse.papyrus.widgets.Activator.getDefault().getImageDescriptor(Activator.PLUGIN_ID, "/icons/wizban-config.png"));

+		setDefaultPageImageDescriptor(org.eclipse.papyrus.infra.widgets.Activator.getDefault().getImageDescriptor(Activator.PLUGIN_ID, "/icons/wizban-config.png"));

 		setWindowTitle(Messages.CreateNewCustomizationPluginWizard_CustomizationPlugin);

 		current = this;

 	}

diff --git a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/wizard/CustomizationPage.java b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/wizard/CustomizationPage.java
index c69cac34bba..5c319ad5347 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/wizard/CustomizationPage.java
+++ b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/wizard/CustomizationPage.java
@@ -20,10 +20,10 @@ import org.eclipse.papyrus.customization.display.DisplayManager;
 import org.eclipse.papyrus.customization.messages.Messages;

 import org.eclipse.papyrus.customization.model.customization.CustomizationConfiguration;

 import org.eclipse.papyrus.customization.model.customization.CustomizationPackage;

-import org.eclipse.papyrus.properties.contexts.View;

-import org.eclipse.papyrus.properties.runtime.ConstraintEngine;

-import org.eclipse.papyrus.properties.runtime.EmbeddedDisplayEngine;

-import org.eclipse.papyrus.properties.widgets.layout.PropertiesLayout;

+import org.eclipse.papyrus.views.properties.contexts.View;

+import org.eclipse.papyrus.views.properties.runtime.ConstraintEngine;

+import org.eclipse.papyrus.views.properties.runtime.EmbeddedDisplayEngine;

+import org.eclipse.papyrus.views.properties.widgets.layout.PropertiesLayout;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.layout.FillLayout;

 import org.eclipse.swt.layout.GridData;

@@ -39,7 +39,7 @@ public class CustomizationPage extends WizardPage {
 	}

 

 	protected CustomizationPage(CustomizationConfiguration configuration) {

-		super(Messages.CustomizationPage_Customization);//, null, org.eclipse.papyrus.widgets.Activator.getDefault().getImageDescriptor("icons/papyrus.png"));

+		super(Messages.CustomizationPage_Customization);//, null, org.eclipse.papyrus.infra.widgets.Activator.getDefault().getImageDescriptor("icons/papyrus.png"));

 		setDescription("Select your customization configuration files");

 		setTitle(Messages.CustomizationPage_Customization);

 		this.configuration = configuration;