Bug 457266 - Remove pdoc from papyrus repository

Change-Id: I621a26b4b5fb54cf096817c7859f8628e423645c Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>
author: Benoit Maggi 2015-01-19 09:57:41 +0000
committer: Benoit Maggi 2015-02-17 15:03:48 +0000
commit: 6db3a2d44215b4d5f3d3ce3c8efaa1c435c9cc0f (patch)
tree: 09857014032c0a765b415c3b8d5840f20d0cd896
parent: ada1991844d16d1a7e989d4a419b533b060dc1c9 (diff)
download: org.eclipse.papyrus-6db3a2d44215b4d5f3d3ce3c8efaa1c435c9cc0f.tar.gz
org.eclipse.papyrus-6db3a2d44215b4d5f3d3ce3c8efaa1c435c9cc0f.tar.xz
org.eclipse.papyrus-6db3a2d44215b4d5f3d3ce3c8efaa1c435c9cc0f.zip
445 files changed, 1312 insertions, 11336 deletions
diff --git a/examples/org.eclipse.papyrus.example.text.instance/META-INF/MANIFEST.MF b/examples/org.eclipse.papyrus.example.text.instance/META-INF/MANIFEST.MF
index 03c9fc178a9..118a54ecb88 100644
--- a/examples/org.eclipse.papyrus.example.text.instance/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.papyrus.example.text.instance/META-INF/MANIFEST.MF
@@ -14,4 +14,4 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.example.text.instance;singlet
  on:=true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
+Bundle-Description: %pluginDescription
diff --git a/examples/org.eclipse.papyrus.example.text.instance/build.properties b/examples/org.eclipse.papyrus.example.text.instance/build.properties
index 6672f2400bf..83183307edb 100644
--- a/examples/org.eclipse.papyrus.example.text.instance/build.properties
+++ b/examples/org.eclipse.papyrus.example.text.instance/build.properties
@@ -14,7 +14,6 @@ bin.includes = .,\
                META-INF/,\
                plugin.xml,\
                about.html,\
-               plugin.pdoc,\
                plugin.properties,\
                build.properties
 jars.compile.order = .
diff --git a/examples/org.eclipse.papyrus.example.text.instance/plugin.pdoc b/examples/org.eclipse.papyrus.example.text.instance/plugin.pdoc
deleted file mode 100644
index e59da2f931a..00000000000
--- a/examples/org.eclipse.papyrus.example.text.instance/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides the content model for the papyrus text editor">
-  <referent firstName="vincent" lastName="lorenzo" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA-LIST"/>
-</doc:Documentation>
diff --git a/examples/org.eclipse.papyrus.example.text.instance/plugin.properties b/examples/org.eclipse.papyrus.example.text.instance/plugin.properties
index fa4bae9bc58..6cb01adb217 100644
--- a/examples/org.eclipse.papyrus.example.text.instance/plugin.properties
+++ b/examples/org.eclipse.papyrus.example.text.instance/plugin.properties
@@ -11,3 +11,5 @@
 
 pluginName = Papyrus Text Editor Example (Incubation)
 providerName = Eclipse Modeling Project
+
+pluginDescription=This plugin provides the content model for the papyrus text editor
+\ No newline at end of file
diff --git a/examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/META-INF/MANIFEST.MF b/examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/META-INF/MANIFEST.MF
index 87b473b7f33..35871a92f13 100644
--- a/examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/META-INF/MANIFEST.MF
@@ -26,4 +26,4 @@ Bundle-Activator: org.eclipse.papyrus.example.uml.comment.editor.newre
 Bundle-SymbolicName: org.eclipse.papyrus.example.uml.comment.editor.ne
  wresource;singleton:=true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
+Bundle-Description: %pluginDescription
diff --git a/examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/build.properties b/examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/build.properties
index ff36391d05a..274b1327ea1 100644
--- a/examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/build.properties
+++ b/examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/build.properties
@@ -3,7 +3,6 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               plugin.pdoc,\
                icons/,\
                build.properties,\
                about.html
diff --git a/examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/plugin.pdoc b/examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/plugin.pdoc
deleted file mode 100644
index 5bc139de32c..00000000000
--- a/examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides a editor for uml.Comment. The informations are stored in&#xD;&#xA;a new file : .comment">
-  <referent firstName="vincent" lastName="lorenzo" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA-LIST"/>
-</doc:Documentation>
diff --git a/examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/plugin.properties b/examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/plugin.properties
new file mode 100644
index 00000000000..0bf1dafb010
--- /dev/null
+++ b/examples/org.eclipse.papyrus.example.uml.comment.editor.newresource/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+# Copyright (c) 2015 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
+##################################################################################)
+
+pluginDescription=This plugin provides a editor for uml.Comment. The informations are stored in a new file : .comment
+\ No newline at end of file
diff --git a/examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/META-INF/MANIFEST.MF b/examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/META-INF/MANIFEST.MF
index 376c0af0b01..e3c5f28a918 100644
--- a/examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/META-INF/MANIFEST.MF
@@ -26,4 +26,4 @@ Bundle-Activator: org.eclipse.papyrus.example.uml.comment.editor.share
 Bundle-SymbolicName: org.eclipse.papyrus.example.uml.comment.editor.sh
  aredresource;singleton:=true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
+Bundle-Description: %pluginDescription
diff --git a/examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/build.properties b/examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/build.properties
index 093ba6b8efe..1bf7b240421 100644
--- a/examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/build.properties
+++ b/examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/build.properties
@@ -1,10 +1,8 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               about.html,\
-               build.properties,\
-               icons/,\
-               plugin.pdoc
-src.includes = about.html
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               about.html,\
+               build.properties,\
+               icons/
diff --git a/examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/plugin.pdoc b/examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/plugin.pdoc
deleted file mode 100644
index 9bec7dbaf86..00000000000
--- a/examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides a editor for uml.Comment. The informations are stored in the .notation">
-  <referent firstName="vincent" lastName="lorenzo" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA-LIST"/>
-</doc:Documentation>
diff --git a/examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/plugin.properties b/examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/plugin.properties
new file mode 100644
index 00000000000..239f4eed2c8
--- /dev/null
+++ b/examples/org.eclipse.papyrus.example.uml.comment.editor.sharedresource/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+# Copyright (c) 2015 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
+##################################################################################)
+
+pluginDescription=This plugin provides a editor for uml.Comment. The informations are stored in the .notation
+\ No newline at end of file
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/META-INF/MANIFEST.MF b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/META-INF/MANIFEST.MF
index 3babf3a02ab..2b007df3e69 100644
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/META-INF/MANIFEST.MF
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/META-INF/MANIFEST.MF
@@ -17,4 +17,4 @@ Bundle-Description: This plugin contains adl4 eclipse profile used to
 Bundle-SymbolicName: org.eclipse.papyrus.adl4eclipse.profile;singleton
  :=true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
+Bundle-Description: %pluginDescription
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/plugin.pdoc b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/plugin.pdoc
deleted file mode 100644
index c6a9496fb91..00000000000
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/plugin.pdoc
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin contains adl4 eclipse profile used to  model eclipse plugins.&#xD;&#xA;The plugins that allow the modelization is or.eclipse.papyrus.adl4eclipsetool&#xD;&#xA;More details can be found in the docs directory of or.eclipse.papyrus.adl4eclipsetool.">
-  <implicitDependencies plugin="org.eclipse.papyrus.osgi.profile" comment="plugin that contains profile to osgi bundles. "/>
-  <referent firstName="Patrick" lastName="Tessier" eMail="patrick.tessier@cea.fr" currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/plugin.properties b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/plugin.properties
index 81eb6969995..637ced496e4 100644
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/plugin.properties
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipse.profile/plugin.properties
@@ -10,3 +10,5 @@
 ##################################################################################
 pluginName=ADL4Eclipse (Incubation)
 providerName=Eclipse Modeling Project
+
+pluginDescription=This plugin contains adl4 eclipse profile used to  model eclipse plugins. The plugins that allow the modelization is or.eclipse.papyrus.adl4eclipsetool&#xD;&#xA;More details can be found in the docs directory of or.eclipse.papyrus.adl4eclipsetool.
+\ No newline at end of file
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/META-INF/MANIFEST.MF b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/META-INF/MANIFEST.MF
index bd085bb7f68..426d9213dcd 100644
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/META-INF/MANIFEST.MF
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/META-INF/MANIFEST.MF
@@ -27,4 +27,4 @@ Bundle-Description: This plugin has in charge to connect the tool to m
 Bundle-SymbolicName: org.eclipse.papyrus.adl4eclipsetool.assistant;sin
  gleton:=true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
+Bundle-Description: %pluginDescription
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/plugin.pdoc b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/plugin.pdoc
deleted file mode 100644
index f1906087118..00000000000
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/plugin.pdoc
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin has in charge to connect the tool to model eclipse plugins withe the eclipse UI.&#xD;&#xA;The plugins that allow the modelization is or.eclipse.papyrus.adl4eclipsetool.&#xD;&#xA;More details can be found in the docs directory of or.eclipse.papyrus.adl4eclipsetool.">
-  <implicitDependencies plugin="org.eclipse.papyrus.adl4eclipsetool" comment="plugin that contains profile to osgi bundles. "/>
-  <referent firstName="Patrick" lastName="Tessier" eMail="patrick.tessier@cea.fr" currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/plugin.properties b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/plugin.properties
index 48b74745d72..fd4797847a3 100644
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/plugin.properties
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/plugin.properties
@@ -10,3 +10,5 @@
 ##################################################################################
 pluginName=ADL4eclipseTool Assistant (Incubation)
 providerName=Eclipse Modeling Project
+
+pluginDescription=This plugin has in charge to connect the tool to model eclipse plugins withe the eclipse UI.&#xD;&#xA;The plugins that allow the modelization is or.eclipse.papyrus.adl4eclipsetool. More details can be found in the docs directory of or.eclipse.papyrus.adl4eclipsetool.
+\ No newline at end of file
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/META-INF/MANIFEST.MF b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/META-INF/MANIFEST.MF
index d34aacba110..b03f5e32cf8 100644
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/META-INF/MANIFEST.MF
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/META-INF/MANIFEST.MF
@@ -26,4 +26,4 @@ Bundle-Description: The purpose of this plugin is to model the archite
 Bundle-SymbolicName: org.eclipse.papyrus.adl4eclipsetool;singleton:=tr
  ue
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
+Bundle-Description: %pluginDescription
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/build.properties b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/build.properties
index 7e0e532bb44..1ba64380ba8 100644
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/build.properties
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/build.properties
@@ -8,4 +8,3 @@ bin.includes = META-INF/,\
                img/
 src.includes = about.html,\
                docs/,\
-               plugin.pdoc
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/plugin.pdoc b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/plugin.pdoc
deleted file mode 100644
index b2e4532da4f..00000000000
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/plugin.pdoc
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="The purpose of this plugin is to model the architecture of eclipse-plugin into UML by using OSGI and ADL4Eclipse profile.&#xD;&#xA;More details can be found in the docs directory.">
-  <implicitDependencies plugin="org.eclipse.papyrus.adl4eclipse.profile" comment="plugin that contains profile to model eclipse plugins"/>
-  <implicitDependencies plugin="org.eclipse.papyrus.osgi.profile" comment="plugin that contains profile to osgi bundles. "/>
-  <referent firstName="Patrick" lastName="Tessier" eMail="patrick.tessier@cea.fr" currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/plugin.properties b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/plugin.properties
index 18e4eebe362..12e4b1b037a 100644
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/plugin.properties
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool/plugin.properties
@@ -10,3 +10,5 @@
 ##################################################################################
 pluginName=ADL4eclipseTool (Incubation)
 providerName=Eclipse Modeling Project
+
+pluginDescription=The purpose of this plugin is to model the architecture of eclipse-plugin into UML by using OSGI and ADL4Eclipse profile.&#xD;&#xA;More details can be found in the docs directory.
+\ No newline at end of file
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.osgi.profile/META-INF/MANIFEST.MF b/extraplugins/adl4eclipse/org.eclipse.papyrus.osgi.profile/META-INF/MANIFEST.MF
index eb0ecc926d7..ed4b8798431 100644
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.osgi.profile/META-INF/MANIFEST.MF
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.osgi.profile/META-INF/MANIFEST.MF
@@ -17,4 +17,4 @@ Bundle-Description: This plugin contains a part of osgi profile used t
  ocs directory of or.eclipse.papyrus.adl4eclipsetool.
 Bundle-SymbolicName: org.eclipse.papyrus.osgi.profile;singleton:=true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
+Bundle-Description: %pluginDescription
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.osgi.profile/build.properties b/extraplugins/adl4eclipse/org.eclipse.papyrus.osgi.profile/build.properties
index c8fc363ae1d..75c9a7644b1 100644
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.osgi.profile/build.properties
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.osgi.profile/build.properties
@@ -7,4 +7,4 @@ bin.includes = META-INF/,\
                resource/,\
                about.html,\
                img/
-src.includes = about.html
+src.includes = about.html
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.osgi.profile/plugin.pdoc b/extraplugins/adl4eclipse/org.eclipse.papyrus.osgi.profile/plugin.pdoc
deleted file mode 100644
index a7208bfada9..00000000000
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.osgi.profile/plugin.pdoc
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin contains a part of osgi profile used to  model eclipse plugins.&#xD;&#xA;The plugins that allow the modelization is or.eclipse.papyrus.adl4eclipsetool.&#xD;&#xA;More details can be found in the docs directory of or.eclipse.papyrus.adl4eclipsetool.">
-  <implicitDependencies plugin="org.eclipse.papyrus.adl4eclipse.profile" comment="plugin that contains profile to model eclipse plugins"/>
-  <implicitDependencies plugin="org.eclipse.papyrus.osgi.profile" comment="plugin that contains profile to osgi bundles. "/>
-  <referent firstName="Patrick" lastName="Tessier" eMail="patrick.tessier@cea.fr" currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.osgi.profile/plugin.properties b/extraplugins/adl4eclipse/org.eclipse.papyrus.osgi.profile/plugin.properties
index 937cd335406..af856d7fd07 100644
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.osgi.profile/plugin.properties
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.osgi.profile/plugin.properties
@@ -10,3 +10,5 @@
 ##################################################################################
 pluginName=OSGI Profile (Incubation)
 providerName=Eclipse Modeling Project
+
+pluginDescription=This plugin contains a part of osgi profile used to  model eclipse plugins. The plugins that allow the modelization is or.eclipse.papyrus.adl4eclipsetool. More details can be found in the docs directory of or.eclipse.papyrus.adl4eclipsetool.
+\ No newline at end of file
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.core/META-INF/MANIFEST.MF b/extraplugins/cdo/org.eclipse.papyrus.cdo.core/META-INF/MANIFEST.MF
index 32742da246e..6437025d7c2 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.core/META-INF/MANIFEST.MF
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.core/META-INF/MANIFEST.MF
@@ -60,4 +60,4 @@ Bundle-Activator: org.eclipse.papyrus.cdo.internal.core.Activator
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.cdo.core;singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-
+Bundle-Description: %pluginDescription
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.core/plugin.pdoc b/extraplugins/cdo/org.eclipse.papyrus.cdo.core/plugin.pdoc
deleted file mode 100644
index 81916c11be2..00000000000
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.core/plugin.pdoc
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="The core APIs and implementation of CDO integration in the Papyrus modeler workbench.">
-  <implicitDependencies plugin="org.eclipse.papyrus.infra.gmfdiag.commands" comment="This dependency is required to specialize the Papyrus implementation of the EMF CommandStack."/>
-  <implicitDependencies plugin="org.eclipse.emf.cdo.dawn" comment="The Dawn dependency provides the CDOResource specialization needed to support Papyrus diagrams via the GMF Notation model.&#xA;Ideally, we would remove this dependency by building the necessary support in Papyrus; continued maintenance of the Dawn component is threadbare."/>
-  <referent firstName="Christian" lastName="Damus" eMail="give.a.damus@gmail.com" currentCompany="(independent committer)"/>
-</doc:Documentation>
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.core/plugin.properties b/extraplugins/cdo/org.eclipse.papyrus.cdo.core/plugin.properties
index 0b690a42f75..caee5089a19 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.core/plugin.properties
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.core/plugin.properties
@@ -11,3 +11,5 @@
 
 pluginName = Papyrus CDO Model Repository Core (Incubation)
 providerName = Eclipse Modeling Project
+
+pluginDescription=The core APIs and implementation of CDO integration in the Papyrus modeler workbench.
+\ No newline at end of file
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/META-INF/MANIFEST.MF b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/META-INF/MANIFEST.MF
index 0f8aa60196e..0b475c7d2b5 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/META-INF/MANIFEST.MF
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/META-INF/MANIFEST.MF
@@ -25,4 +25,4 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.cdo.ui.customization.properti
  es;singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-
+Bundle-Description: %pluginDescription
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/plugin.pdoc b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/plugin.pdoc
deleted file mode 100644
index 867b774bf33..00000000000
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="Provides primarily Properties View Customization model storage in CDO repositories.">
-  <referent firstName="Christian" lastName="Damus" eMail="give.a.damus@gmail.com" currentCompany="(independent committer)"/>
-</doc:Documentation>
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/plugin.properties b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/plugin.properties
index c513398b424..ddcb52a01b8 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/plugin.properties
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.customization.properties/plugin.properties
@@ -11,3 +11,5 @@
 
 pluginName = Papyrus CDO Properties View Customization (Incubation)
 providerName = Eclipse Modeling Project
+
+pluginDescription=Provides primarily Properties View Customization model storage in CDO repositories.
+\ No newline at end of file
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/META-INF/MANIFEST.MF b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/META-INF/MANIFEST.MF
index 5ecea2b568d..754f6630730 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/META-INF/MANIFEST.MF
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/META-INF/MANIFEST.MF
@@ -28,4 +28,4 @@ Bundle-Activator: org.eclipse.papyrus.cdo.internal.ui.hyperlink.Activa
 Bundle-SymbolicName: org.eclipse.papyrus.cdo.ui.hyperlink;singleton:=t
  rue
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-
+Bundle-Description: %pluginDescription
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/plugin.pdoc b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/plugin.pdoc
deleted file mode 100644
index dfca23d57e5..00000000000
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="Provides primarily hyperlink creation, navigation, and drag-and-drop support for diagrams and resources in CDO repositories.">
-  <referent firstName="Christian" lastName="Damus" eMail="give.a.damus@gmail.com" currentCompany="(independent committer)"/>
-</doc:Documentation>
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/plugin.properties b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/plugin.properties
index 7e297baf2e4..7c83c7ffba7 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/plugin.properties
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.hyperlink/plugin.properties
@@ -11,3 +11,5 @@
 
 pluginName = Papyrus CDO Document Hyperlink Support (Incubation)
 providerName = Eclipse Modeling Project
+
+pluginDescription=Provides primarily hyperlink creation, navigation, and drag-and-drop support for diagrams and resources in CDO repositories.
+\ No newline at end of file
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/META-INF/MANIFEST.MF b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/META-INF/MANIFEST.MF
index 42897bb5b61..d0abbcb18f3 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/META-INF/MANIFEST.MF
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/META-INF/MANIFEST.MF
@@ -55,4 +55,4 @@ Bundle-Activator: org.eclipse.papyrus.cdo.internal.ui.Activator
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.cdo.ui;singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-
+Bundle-Description: %pluginDescription
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/plugin.pdoc b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/plugin.pdoc
deleted file mode 100644
index ea3de1ebcac..00000000000
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/plugin.pdoc
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="The main UI components (views, editors) for CDO integration in the Papyrus modeler workbench.">
-  <implicitDependencies plugin="org.eclipse.emf.cdo.ui.admin" comment="Supports integration of user management functions (change password, manage security) in the Model Repositories view."/>
-  <implicitDependencies plugin="org.eclipse.emf.cdo.dawn.ui" comment="The Dawn dependency provides the view decorations/stylizers for presentation of conflict states, lock states, etc.&#xA;Ideally, we would remove this dependency by building the necessary support in Papyrus; continued maintenance of the Dawn component is threadbare."/>
-  <referent firstName="Christian" lastName="Damus" eMail="give.a.damus@gmail.com" currentCompany="(independent committer)"/>
-</doc:Documentation>
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/plugin.properties b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/plugin.properties
index f6fa05b14af..38781500984 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/plugin.properties
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.ui/plugin.properties
@@ -31,3 +31,5 @@ navigatorDropContent.name = Papyrus Model Repository Content
 repoFiltersExtPt.name = Model Repository Item Provider Filters
 openInModelRepositoriesCommand.label = Open in Model Repositories
 openInModelRepositoriesCommand.name = Open in Model Repositories View
+
+pluginDescription=The main UI components (views, editors) for CDO integration in the Papyrus modeler workbench.
+\ No newline at end of file
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/META-INF/MANIFEST.MF b/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/META-INF/MANIFEST.MF
index 1e4864ae9fb..d03ebdcfae2 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/META-INF/MANIFEST.MF
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/META-INF/MANIFEST.MF
@@ -21,4 +21,4 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.cdo.uml.diagram.ui;singleton:
  =true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-
+Bundle-Description: %pluginDescription
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/plugin.pdoc b/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/plugin.pdoc
deleted file mode 100644
index 0d39126d075..00000000000
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="Provides primarily the extension of the New Papyrus Model wizard for creation of models in CDO repositories.">
-  <referent firstName="Christian" lastName="Damus" eMail="give.a.damus@gmail.com" currentCompany="(independent committer)"/>
-</doc:Documentation>
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/plugin.properties b/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/plugin.properties
index 8507029073a..2e7628ec545 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/plugin.properties
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.diagram.ui/plugin.properties
@@ -14,4 +14,5 @@ providerName = Eclipse Modeling Project
 
 storageProvider.name = In a model repository
 newModelCommand.label = New Papyrus Model
-newModelCommand.name = New Papyrus Model
-\ No newline at end of file
+newModelCommand.name = New Papyrus Model
+pluginDescription=Provides primarily the extension of the New Papyrus Model wizard for creation of models in CDO repositories.
+\ No newline at end of file
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui/META-INF/MANIFEST.MF b/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui/META-INF/MANIFEST.MF
index 4837064bdb4..87cb3b912f6 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui/META-INF/MANIFEST.MF
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui/META-INF/MANIFEST.MF
@@ -28,4 +28,4 @@ Bundle-Activator: org.eclipse.papyrus.cdo.uml.search.internal.ui.Activ
 Bundle-SymbolicName: org.eclipse.papyrus.cdo.uml.search.ui;singleton:=
  true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-
+Bundle-Description: %pluginDescription
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui/plugin.pdoc b/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui/plugin.pdoc
deleted file mode 100644
index f62dd97a5c8..00000000000
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="Provides integration of the Papyrus Model Search functionality to search in CDO repositories, with OCL and text searches.">
-  <referent firstName="Christian" lastName="Damus" eMail="give.a.damus@gmail.com" currentCompany="(independent committer)"/>
-</doc:Documentation>
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui/plugin.properties b/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui/plugin.properties
index f369ee56e80..2c568c8127f 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui/plugin.properties
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui/plugin.properties
@@ -11,3 +11,5 @@
 
 pluginName = Papyrus CDO Search UI (Incubation)
 providerName = Eclipse Modeling Project
+
+pluginDescription=Provides integration of the Papyrus Model Search functionality to search in CDO repositories, with OCL and text searches.
+\ No newline at end of file
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui/META-INF/MANIFEST.MF b/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui/META-INF/MANIFEST.MF
index 95d89522e0e..7505a44ef41 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui/META-INF/MANIFEST.MF
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui/META-INF/MANIFEST.MF
@@ -18,4 +18,4 @@ Bundle-Activator: org.eclipse.papyrus.cdo.uml.internal.ui.Activator
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.cdo.uml.ui;singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-
+Bundle-Description: %pluginDescription
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui/plugin.pdoc b/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui/plugin.pdoc
deleted file mode 100644
index 9729a1edda0..00000000000
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="Provides primarily the extension of the Import Package dialog for importing packages from models in CDO repositories.">
-  <referent firstName="Christian" lastName="Damus" eMail="give.a.damus@gmail.com" currentCompany="(independent committer)"/>
-</doc:Documentation>
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui/plugin.properties b/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui/plugin.properties
index 8c9128b364f..085ebe19e86 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui/plugin.properties
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui/plugin.properties
@@ -12,4 +12,5 @@
 pluginName = Papyrus CDO UML UI (Incubation)
 providerName = Eclipse Modeling Project
 
-importSource.name = Model Repositories
-\ No newline at end of file
+importSource.name = Model Repositories
+pluginDescription=Provides primarily the extension of the Import Package dialog for importing packages from models in CDO repositories.
+\ No newline at end of file
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/META-INF/MANIFEST.MF b/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/META-INF/MANIFEST.MF
index bb1518d4815..2ed07a30199 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/META-INF/MANIFEST.MF
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/META-INF/MANIFEST.MF
@@ -16,4 +16,4 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.cdo.validation.problems.edit;
  singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-
+Bundle-Description: %pluginDescription
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/plugin.pdoc b/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/plugin.pdoc
deleted file mode 100644
index 223e7f372a6..00000000000
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="EMF.Edit providers for the CDO model validation problems model.">
-  <referent firstName="Christian" lastName="Damus" eMail="give.a.damus@gmail.com" currentCompany="(independent committer)"/>
-</doc:Documentation>
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/plugin.properties b/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/plugin.properties
index b6da9d3b26d..13122eea62f 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/plugin.properties
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.edit/plugin.properties
@@ -52,3 +52,5 @@ _UI_EProblem_type_feature = Type
 _UI_EProblem_attributes_feature = Attributes
 _UI_Attribute_key_feature = Name
 _UI_Attribute_value_feature = Value
+
+pluginDescription=EMF.Edit providers for the CDO model validation problems model.
+\ No newline at end of file
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems/META-INF/MANIFEST.MF b/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems/META-INF/MANIFEST.MF
index 5b54772096a..2f30952b5e3 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems/META-INF/MANIFEST.MF
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems/META-INF/MANIFEST.MF
@@ -18,4 +18,4 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.cdo.validation.problems;singl
  eton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-
+Bundle-Description: %pluginDescription
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems/plugin.pdoc b/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems/plugin.pdoc
deleted file mode 100644
index 5f160cd24d9..00000000000
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="Provides a modeled implementation of problem markers for validation problems in resources in CDO repositories.">
-  <referent firstName="Christian" lastName="Damus" eMail="give.a.damus@gmail.com" currentCompany="(independent committer)"/>
-</doc:Documentation>
diff --git a/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems/plugin.properties b/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems/plugin.properties
index e84bbdabccb..938a152d334 100644
--- a/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems/plugin.properties
+++ b/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems/plugin.properties
@@ -11,3 +11,5 @@
 
 pluginName = Papyrus CDO Model Repository Problems Model (Incubation)
 providerName = Eclipse Modeling Project
+
+pluginDescription=Provides a modeled implementation of problem markers for validation problems in resources in CDO repositories.
+\ No newline at end of file
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/META-INF/MANIFEST.MF b/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/META-INF/MANIFEST.MF
index a65fa07e746..942be412516 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/META-INF/MANIFEST.MF
+++ b/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/META-INF/MANIFEST.MF
@@ -26,7 +26,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",
  org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",
  org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0"
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 1.1.0.qualifier
@@ -37,4 +37,4 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.texteditor.cdt;singleton:=tru
  e
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-
+Bundle-Description: %pluginDescription
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/build.properties b/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/build.properties
index cf4a20e0990..dca8cd871c9 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/build.properties
+++ b/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/build.properties
@@ -6,6 +6,5 @@ bin.includes = META-INF/,\
                about.html,\
                build.properties,\
                icons/,\
-               plugin.pdoc,\
                plugin.properties
 src.includes = about.html
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/plugin.pdoc b/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/plugin.pdoc
deleted file mode 100644
index 9bec7dbaf86..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides a editor for uml.Comment. The informations are stored in the .notation">
-  <referent firstName="vincent" lastName="lorenzo" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA-LIST"/>
-</doc:Documentation>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/plugin.properties b/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/plugin.properties
index 5078ac35841..7e334617814 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/plugin.properties
+++ b/extraplugins/codegen/org.eclipse.papyrus.texteditor.cdt/plugin.properties
@@ -10,3 +10,5 @@
 ###############################################################################
 pluginName=Papyrus CDT editor integration (Incubation)
 providerName=Eclipse Modeling Project
+
+pluginDescription=This plugin provides a editor for uml.Comment. The informations are stored in the .notation
+\ No newline at end of file
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/META-INF/MANIFEST.MF b/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/META-INF/MANIFEST.MF
index 3cf5f877df4..7f120eac4ef 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/META-INF/MANIFEST.MF
+++ b/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/META-INF/MANIFEST.MF
@@ -14,4 +14,4 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.texteditor.model;singleton:=t
  rue
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-
+Bundle-Description: %pluginDescription
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/build.properties b/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/build.properties
index 6672f2400bf..83183307edb 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/build.properties
+++ b/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/build.properties
@@ -14,7 +14,6 @@ bin.includes = .,\
                META-INF/,\
                plugin.xml,\
                about.html,\
-               plugin.pdoc,\
                plugin.properties,\
                build.properties
 jars.compile.order = .
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/plugin.pdoc b/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/plugin.pdoc
deleted file mode 100644
index e59da2f931a..00000000000
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides the content model for the papyrus text editor">
-  <referent firstName="vincent" lastName="lorenzo" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA-LIST"/>
-</doc:Documentation>
diff --git a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/plugin.properties b/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/plugin.properties
index a04aa34fe31..b7485255b04 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/plugin.properties
+++ b/extraplugins/codegen/org.eclipse.papyrus.texteditor.model/plugin.properties
@@ -11,3 +11,5 @@
 # 
 pluginName = Ecore model for text editors (Incubation)
 providerName = Eclipse Modeling Project
+
+pluginDescription=This plugin provides the content model for the papyrus text editor
+\ No newline at end of file
diff --git a/extraplugins/moka/org.eclipse.papyrus.moka.fuml.standardlibrary/META-INF/MANIFEST.MF b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.standardlibrary/META-INF/MANIFEST.MF
index f0d91a676f7..58e1eb31374 100644
--- a/extraplugins/moka/org.eclipse.papyrus.moka.fuml.standardlibrary/META-INF/MANIFEST.MF
+++ b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.standardlibrary/META-INF/MANIFEST.MF
@@ -26,4 +26,4 @@ Bundle-Activator: org.eclipse.papyrus.moka.fuml.standardlibrary.Activa
 Bundle-SymbolicName: org.eclipse.papyrus.moka.fuml.standardlibrary;sin
  gleton:=true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
+Bundle-Description: %pluginDescription
diff --git a/extraplugins/moka/org.eclipse.papyrus.moka.fuml.standardlibrary/plugin.pdoc b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.standardlibrary/plugin.pdoc
deleted file mode 100644
index 93ce4eeb1f4..00000000000
--- a/extraplugins/moka/org.eclipse.papyrus.moka.fuml.standardlibrary/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="OpaqueBehaviorExecutions for the standard fUML library">
-  <referent firstName="Arnaud" lastName="Cuccuru" eMail="arnaud.cuccuru@cea.fr" currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/extraplugins/moka/org.eclipse.papyrus.moka.fuml.standardlibrary/plugin.properties b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.standardlibrary/plugin.properties
new file mode 100644
index 00000000000..07b6d6e4fb0
--- /dev/null
+++ b/extraplugins/moka/org.eclipse.papyrus.moka.fuml.standardlibrary/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+# Copyright (c) 2015 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
+##################################################################################)
+
+pluginDescription=OpaqueBehaviorExecutions for the standard fUML library
+\ No newline at end of file
diff --git a/extraplugins/moka/org.eclipse.papyrus.moka.fuml/META-INF/MANIFEST.MF b/extraplugins/moka/org.eclipse.papyrus.moka.fuml/META-INF/MANIFEST.MF
index e14ecf8d3cb..95f24d32fc3 100644
--- a/extraplugins/moka/org.eclipse.papyrus.moka.fuml/META-INF/MANIFEST.MF
+++ b/extraplugins/moka/org.eclipse.papyrus.moka.fuml/META-INF/MANIFEST.MF
@@ -42,4 +42,4 @@ Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.moka.fuml.Activator
 Bundle-SymbolicName: org.eclipse.papyrus.moka.fuml;singleton:=true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
+Bundle-Description: %pluginDescription
diff --git a/extraplugins/moka/org.eclipse.papyrus.moka.fuml/plugin.pdoc b/extraplugins/moka/org.eclipse.papyrus.moka.fuml/plugin.pdoc
deleted file mode 100644
index efb8e0a040c..00000000000
--- a/extraplugins/moka/org.eclipse.papyrus.moka.fuml/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="A straightforward implementation of fUML 1.1 Execution Model.&#xD;&#xA;Contributes to &quot;Moka execution engine&quot; extension point.">
-  <referent firstName="Arnaud" lastName="Cuccuru" eMail="arnaud.cuccuru@cea.fr" currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/extraplugins/moka/org.eclipse.papyrus.moka.fuml/plugin.properties b/extraplugins/moka/org.eclipse.papyrus.moka.fuml/plugin.properties
new file mode 100644
index 00000000000..e1dbbf6f940
--- /dev/null
+++ b/extraplugins/moka/org.eclipse.papyrus.moka.fuml/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+# Copyright (c) 2015 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
+##################################################################################)
+
+pluginDescription=A straightforward implementation of fUML 1.1 Execution Model. Contributes to Moka execution engine extension point.
+\ No newline at end of file
diff --git a/extraplugins/moka/org.eclipse.papyrus.moka/META-INF/MANIFEST.MF b/extraplugins/moka/org.eclipse.papyrus.moka/META-INF/MANIFEST.MF
index 82ae062427c..5482a55355f 100644
--- a/extraplugins/moka/org.eclipse.papyrus.moka/META-INF/MANIFEST.MF
+++ b/extraplugins/moka/org.eclipse.papyrus.moka/META-INF/MANIFEST.MF
@@ -35,4 +35,4 @@ Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.moka.Activator
 Bundle-SymbolicName: org.eclipse.papyrus.moka;singleton:=true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
+Bundle-Description: %pluginDescription
diff --git a/extraplugins/moka/org.eclipse.papyrus.moka/plugin.pdoc b/extraplugins/moka/org.eclipse.papyrus.moka/plugin.pdoc
deleted file mode 100644
index 45da37f970e..00000000000
--- a/extraplugins/moka/org.eclipse.papyrus.moka/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="Moka is an extendible framework for model execution.">
-  <referent firstName="Arnaud" lastName="Cuccuru" eMail="arnaud.cuccuru@cea.fr" currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/extraplugins/moka/org.eclipse.papyrus.moka/plugin.properties b/extraplugins/moka/org.eclipse.papyrus.moka/plugin.properties
new file mode 100644
index 00000000000..770424f73c1
--- /dev/null
+++ b/extraplugins/moka/org.eclipse.papyrus.moka/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+# Copyright (c) 2015 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
+##################################################################################)
+
+pluginDescription=Moka is an extendible framework for model execution.
+\ No newline at end of file
diff --git a/extraplugins/req/org.eclipse.papyrus.req.reqif/META-INF/MANIFEST.MF b/extraplugins/req/org.eclipse.papyrus.req.reqif/META-INF/MANIFEST.MF
index 2b019a443d0..4d1df6080ea 100644
--- a/extraplugins/req/org.eclipse.papyrus.req.reqif/META-INF/MANIFEST.MF
+++ b/extraplugins/req/org.eclipse.papyrus.req.reqif/META-INF/MANIFEST.MF
@@ -46,4 +46,3 @@ Export-Package: org.eclipse.papyrus.req.reqif,
  org.eclipse.papyrus.req.reqif.integration.command,
  org.eclipse.papyrus.req.reqif.integration.transformation,
  org.eclipse.papyrus.req.reqif.queries,
- org.eclipse.papyrus.req.reqif.transformation
diff --git a/extraplugins/req/org.eclipse.papyrus.req.reqif/plugin.pdoc b/extraplugins/req/org.eclipse.papyrus.req.reqif/plugin.pdoc
deleted file mode 100644
index 223a56d3522..00000000000
--- a/extraplugins/req/org.eclipse.papyrus.req.reqif/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin is used to make import export of ReqIF files.">
-  <referent firstName="Patrick" lastName="Tessier" eMail="patrick.tessier@cea.fr" currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/extraplugins/req/org.eclipse.papyrus.req.reqif/plugin.properties b/extraplugins/req/org.eclipse.papyrus.req.reqif/plugin.properties
index ea3ab1dc62c..84a87414bf3 100644
--- a/extraplugins/req/org.eclipse.papyrus.req.reqif/plugin.properties
+++ b/extraplugins/req/org.eclipse.papyrus.req.reqif/plugin.properties
@@ -10,3 +10,5 @@
 ##################################################################################
 pluginName=PapyrusReq.ReqIF
 providerName=Eclipse Modeling Project
+
+pluginDescription=This plugin is used to make import export of ReqIF files.
+\ No newline at end of file
diff --git a/extraplugins/revision/org.eclipse.papyrus.revisiontool/META-INF/MANIFEST.MF b/extraplugins/revision/org.eclipse.papyrus.revisiontool/META-INF/MANIFEST.MF
index 35edd222329..c1872d66999 100644
--- a/extraplugins/revision/org.eclipse.papyrus.revisiontool/META-INF/MANIFEST.MF
+++ b/extraplugins/revision/org.eclipse.papyrus.revisiontool/META-INF/MANIFEST.MF
@@ -43,4 +43,3 @@ Export-Package: org.eclipse.papyrus.revision.tool,
 Bundle-ActivationPolicy: lazy
 Bundle-Description: The goal of this plugin is to bring functionality about revision of model
 Bundle-Vendor: %providerName
-Bundle-Localization: plugin
diff --git a/extraplugins/revision/org.eclipse.papyrus.revisiontool/build.properties b/extraplugins/revision/org.eclipse.papyrus.revisiontool/build.properties
index 8d6ec9561ed..bcd3d12d48a 100644
--- a/extraplugins/revision/org.eclipse.papyrus.revisiontool/build.properties
+++ b/extraplugins/revision/org.eclipse.papyrus.revisiontool/build.properties
@@ -4,9 +4,7 @@ bin.includes = META-INF/,\
                .,\
                about.html,\
                doc/,\
-               plugin.pdoc,\
                plugin.properties,\
                plugin.xml
 src.includes = doc/,\
                about.html,\
-               plugin.pdoc
diff --git a/extraplugins/revision/org.eclipse.papyrus.revisiontool/plugin.pdoc b/extraplugins/revision/org.eclipse.papyrus.revisiontool/plugin.pdoc
deleted file mode 100644
index f61d265afc5..00000000000
--- a/extraplugins/revision/org.eclipse.papyrus.revisiontool/plugin.pdoc
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation
-    xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI"
-    xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation"
-    description="The goal of this plugin is to bring functionality about revision of model">
-  <referent
-      firstName="Patrick"
-      lastName="Tessier"
-      eMail="patrick.tessier@cea.fr"
-      currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/extraplugins/revision/org.eclipse.papyrus.revisiontool/plugin.properties b/extraplugins/revision/org.eclipse.papyrus.revisiontool/plugin.properties
index 4fc05cdbcf5..ab3d704fb9d 100644
--- a/extraplugins/revision/org.eclipse.papyrus.revisiontool/plugin.properties
+++ b/extraplugins/revision/org.eclipse.papyrus.revisiontool/plugin.properties
@@ -10,3 +10,5 @@
 ##################################################################################
 pluginName=Revision Tool
 providerName=Eclipse Modeling Project
+
+pluginDescription=The goal of this plugin is to bring functionality about revision of model
+\ No newline at end of file
diff --git a/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/META-INF/MANIFEST.MF b/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/META-INF/MANIFEST.MF
index 6ca65803dac..7e5e22ed76a 100644
--- a/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/META-INF/MANIFEST.MF
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/META-INF/MANIFEST.MF
@@ -24,4 +24,4 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.nattable.converter;
  singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-
+Bundle-Description: %pluginDescription
diff --git a/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/build.properties b/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/build.properties
index 1961e7848c9..4b106d9ed1f 100644
--- a/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/build.properties
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/build.properties
@@ -3,7 +3,6 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               plugin.pdoc,\
                about.html,\
                OSGI-INF/
 src.includes = about.html
diff --git a/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/plugin.pdoc b/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/plugin.pdoc
deleted file mode 100644
index e76e9322193..00000000000
--- a/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides handlers to convert the old tables to the new tables">
-  <referent firstName="vincent" lastName="lorenzo" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA-LIST"/>
-</doc:Documentation>
diff --git a/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/plugin.properties b/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/plugin.properties
new file mode 100644
index 00000000000..ce1e4bdea0a
--- /dev/null
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.emf.nattable.converter/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+# Copyright (c) 2015 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
+##################################################################################)
+
+pluginDescription=This plugin provides handlers to convert the old tables to the new tables
+\ No newline at end of file
diff --git a/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/META-INF/MANIFEST.MF b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/META-INF/MANIFEST.MF
index 95b1cacea2a..295c5e979eb 100644
--- a/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/META-INF/MANIFEST.MF
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/META-INF/MANIFEST.MF
@@ -35,4 +35,4 @@ Bundle-Activator: org.eclipse.papyrus.infra.table.modelexplorer.Activa
 Import-Package: org.eclipse.papyrus.infra.viewpoints.policy
 Bundle-SymbolicName: org.eclipse.papyrus.infra.table.modelexplorer;sin
  gleton:=true
-
+Bundle-Description: %pluginDescription
diff --git a/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/build.properties b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/build.properties
index fed05ec90ca..0a951700694 100644
--- a/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/build.properties
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/build.properties
@@ -4,7 +4,6 @@ bin.includes = META-INF/,\
                resources/,\
                plugin.properties,\
                about.html,\
-               documentation.pdoc
 output.. = bin/
 src.includes = about.html
 source.. = src/
diff --git a/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/documentation.pdoc b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/documentation.pdoc
deleted file mode 100644
index e7a7257ea7e..00000000000
--- a/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/documentation.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin contributes to the ModelExplorer View. It provides customization&#xD;&#xA;to display the Table in the ModelExplorer View + some other functionalities concerning the tables">
-  <referent firstName="Vincent" lastName="Lorenzo" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA-LIST"/>
-</doc:Documentation>
diff --git a/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/plugin.properties b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/plugin.properties
index 218c6567b7f..c0ad9558cff 100644
--- a/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/plugin.properties
+++ b/extraplugins/tablemigration/org.eclipse.papyrus.infra.table.modelexplorer/plugin.properties
@@ -1,3 +1,4 @@
-#Properties file for org.eclipse.papyrus.infra.table.modelexplorer
-pluginProvider = Eclipse Modeling Project
-pluginName = Table Customization For Model Explorer (Incubation)
-\ No newline at end of file
+#Properties file for org.eclipse.papyrus.infra.table.modelexplorer
+pluginProvider = Eclipse Modeling Project
+pluginName = Table Customization For Model Explorer (Incubation)
+pluginDescription=This plugin contributes to the ModelExplorer View. It provides customization to display the Table in the ModelExplorer View + some other functionalities concerning the tables
+\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/META-INF/MANIFEST.MF
index ff45dd142f3..c34cbe80155 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/META-INF/MANIFEST.MF
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/META-INF/MANIFEST.MF
@@ -43,4 +43,4 @@ Bundle-Activator: org.eclipse.papyrus.customization.properties.generat
 Bundle-SymbolicName: org.eclipse.papyrus.customization.properties.gene
  ration;singleton:=true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
+Bundle-Description: %pluginDescription
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/build.properties b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/build.properties
index 8730d784494..b98a78a64b7 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/build.properties
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/build.properties
@@ -1,8 +1,7 @@
-#
-#Mon Sep 12 09:30:04 CEST 2011
-bin.includes=.,META-INF/,transforms/,plugin.xml,about.html,icons/,model/,schema/,plugin.properties,OSGI-INF/
-output..=bin/
-src.includes = about.html,\
-               properties-generation.pdoc
-source..=src/,src-gen/
-bin..=bin/
+#
+#Mon Sep 12 09:30:04 CEST 2011
+bin.includes=.,META-INF/,transforms/,plugin.xml,about.html,icons/,model/,schema/,plugin.properties,OSGI-INF/
+output..=bin/
+src.includes = about.html
+source..=src/,src-gen/
+bin..=bin/
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/plugin.properties b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/plugin.properties
index 9d4145bf4a2..a98692aeeb6 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/plugin.properties
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/plugin.properties
@@ -1,8 +1,13 @@
-
-# <copyright>
-# </copyright>
-#
-# $Id$
-
-pluginName = Papyrus property view generation
-providerName = Eclipse Modeling Project
+#################################################################################
+# Copyright (c) 2015 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+##################################################################################
+
+pluginName = Papyrus property view generation
+providerName = Eclipse Modeling Project
+
+pluginDescription=This plug-in contains a wizard for generating a property view configuration: - From an Ecore Metamodel - From a UML Profile Additionnal generators can be contributed through an extension point.
+\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/properties-generation.pdoc b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/properties-generation.pdoc
deleted file mode 100644
index ca820b6419c..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/properties-generation.pdoc
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation
-    xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI"
-    xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation"
-    description="This plug-in contains a wizard for generating a property view configuration:&#xD;&#xA;&#xD;&#xA;- From an Ecore Metamodel&#xD;&#xA;- From a UML Profile&#xD;&#xA;&#xD;&#xA;Additionnal generators can be contributed through an extension point.">
-  <implicitDependencies
-      plugin="org.eclipse.papyrus.customization.properties.model.xwt"
-      comment="This plug-in needs the XWT projectors to manipulate XWT Files as EMF Models"/>
-  <implicitDependencies
-      plugin="org.eclipse.m2m.qvt.oml.project"
-      comment="This plug-in implicitly requires the qvt.oml.project plug-in to load and execute QVT transformations"/>
-  <referent
-      firstName="Camille"
-      lastName="Letavernier"
-      eMail="camille.letavernier@cea.fr"
-      currentCompany="CEA LIST"/>
-  <additionalComments
-      title="Plug-in state"
-      contents="This plug-in is still a prototype. It cannot be used for complex models or profiles (With dependencies)"/>
-</doc:Documentation>
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/META-INF/MANIFEST.MF
index d6f1a27bbd8..403013a9cf5 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/META-INF/MANIFEST.MF
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/META-INF/MANIFEST.MF
@@ -25,4 +25,4 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.customization.properties.mode
  l.xwt;singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-
+Bundle-Description: %pluginDescription
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/build.properties b/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/build.properties
index 929efa3dcdc..eb0549dd11b 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/build.properties
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/build.properties
@@ -1,14 +1,13 @@
-#
-#Mon Sep 12 09:30:05 CEST 2011
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               Transformation/,\
-               OSGI-INF/,\
-               about.html
-output..=bin/
-src.includes = about.html,\
-               xwt-model.pdoc
-source.. = src/,\
-           src-gen/
-bin..=bin/
+#
+#Mon Sep 12 09:30:05 CEST 2011
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               Transformation/,\
+               OSGI-INF/,\
+               about.html
+output..=bin/
+src.includes = about.html
+source.. = src/,\
+           src-gen/
+bin..=bin/
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/plugin.properties b/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/plugin.properties
new file mode 100644
index 00000000000..c8f09daf30b
--- /dev/null
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+# Copyright (c) 2015 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
+##################################################################################)
+
+pluginDescription=This plug-in contains the EMF Projectors for XWT files. The XWT format is an xml-based format. In order to manipulate these files as EMF Models, we need an Injector to parse them, and an extractor to re-generate them from the modified EMF model.
+\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/xwt-model.pdoc b/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/xwt-model.pdoc
deleted file mode 100644
index 2a8b4ba0b3b..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/xwt-model.pdoc
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation
-    xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI"
-    xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation"
-    description="This plug-in contains the EMF Projectors for XWT files.&#xD;&#xA;&#xD;&#xA;The XWT format is an xml-based format. In order to manipulate these files as EMF Models, we need an Injector to parse them, and an extractor to re-generate them from the modified EMF model.">
-  <implicitDependencies
-      plugin="org.eclipse.m2m.qvt.oml.project"
-      comment="This plug-in implicitly requires the qvt.oml.project plug-in to load and execute QVT transformations"/>
-  <referent
-      firstName="Camille"
-      lastName="Letavernier"
-      eMail="camille.letavernier@cea.fr"
-      currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization.properties/META-INF/MANIFEST.MF
index 1a31690e70f..18d5f8d61aa 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/META-INF/MANIFEST.MF
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties/META-INF/MANIFEST.MF
@@ -34,4 +34,4 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.customization.properties;sing
  leton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-
+Bundle-Description: %pluginDescription
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/build.properties b/plugins/customization/org.eclipse.papyrus.customization.properties/build.properties
index 50e190635f5..01011f2809a 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/build.properties
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties/build.properties
@@ -11,6 +11,5 @@ bin.includes = .,\
                OSGI-INF/
 output..=bin/
 src.includes = about.html,\
-               properties-customization.pdoc,\
                schema/
 source..=src/
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/plugin.properties b/plugins/customization/org.eclipse.papyrus.customization.properties/plugin.properties
new file mode 100644
index 00000000000..b362066cb46
--- /dev/null
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+# Copyright (c) 2015 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
+##################################################################################)
+
+pluginDescription=This plug-in contains the tools for customizing the property view : - An editor for Property view configuration models, with a real-time preview - A Property view configuration for this editor
+\ No newline at end of file
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/properties-customization.pdoc b/plugins/customization/org.eclipse.papyrus.customization.properties/properties-customization.pdoc
deleted file mode 100644
index 104ea6f226a..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/properties-customization.pdoc
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plug-in contains the tools for customizing the property view :&#xD;&#xA;&#xD;&#xA;- An editor for Property view configuration models, with a real-time preview&#xD;&#xA;- A Property view configuration for this editor">
-  <implicitDependencies plugin="org.eclipse.papyrus.customization.properties.model.xwt" comment="This plug-in needs the XWT projectors to manipulate XWT Files as EMF Models"/>
-  <referent firstName="Camille" lastName="Letavernier" eMail="camille.letavernier@cea.fr" currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/plugins/customization/org.eclipse.papyrus.customization/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization/META-INF/MANIFEST.MF
index 48158cc1fbf..ff2e2e63e33 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/META-INF/MANIFEST.MF
+++ b/plugins/customization/org.eclipse.papyrus.customization/META-INF/MANIFEST.MF
@@ -34,4 +34,4 @@ Bundle-Activator: org.eclipse.papyrus.customization.Activator
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.customization;singleton:=true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
+Bundle-Description: %pluginDescription
diff --git a/plugins/customization/org.eclipse.papyrus.customization/papyrus-customization.pdoc b/plugins/customization/org.eclipse.papyrus.customization/papyrus-customization.pdoc
deleted file mode 100644
index 652e5e34f91..00000000000
--- a/plugins/customization/org.eclipse.papyrus.customization/papyrus-customization.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plug-ins provides a wizard for generating customization plug-ins for Papyrus.&#xD;&#xA;&#xD;&#xA;The customization process in Papyrus is essentially based on models, contributed to a Papyrus extension point.&#xD;&#xA;&#xD;&#xA;It can be complicated to distribute a set of customizations in a single plug-in, as you have to know all the plug-ins and extension points.&#xD;&#xA;&#xD;&#xA;This wizards simplifies the process. It supports the following customization elements :&#xD;&#xA;&#xD;&#xA;- EMF Facet UI Custom&#xD;&#xA;- UML Model Templates&#xD;&#xA;- UML Model&#xD;&#xA;- UML Profile&#xD;&#xA;- Property view&#xD;&#xA;- Diagram Palette">
-  <referent firstName="Camille" lastName="Letavernier" eMail="camille.letavernier@cea.fr" currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/plugins/customization/org.eclipse.papyrus.customization/plugin.properties b/plugins/customization/org.eclipse.papyrus.customization/plugin.properties
index d48c4c2059b..8ce8a123cf6 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/plugin.properties
+++ b/plugins/customization/org.eclipse.papyrus.customization/plugin.properties
@@ -1,10 +1,15 @@
-
-# <copyright>
-# </copyright>
-#
-# $Id$
-
-pluginName = Customization Manager
-providerName = Eclipse Modeling Project
-
-wizard.name = DSML configuration plug-in
+#################################################################################
+# Copyright (c) 2015 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+##################################################################################)
+
+pluginName = Customization Manager
+providerName = Eclipse Modeling Project
+
+wizard.name = DSML configuration plug-in
+
+pluginDescription=This plug-ins provides a wizard for generating customization plug-ins for Papyrus. The customization process in Papyrus is essentially based on models, contributed to a Papyrus extension point. It can be complicated to distribute a set of customizations in a single plug-in, as you have to know all the plug-ins and extension points. This wizards simplifies the process. It supports the following customization elements : - EMF Facet UI Custom - UML Model Templates- UML Model- UML Profile- Property view- Diagram Palette
+\ No newline at end of file
diff --git a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/META-INF/MANIFEST.MF
index 10fa11fee9d..9569901e302 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/META-INF/MANIFEST.MF
@@ -14,4 +14,4 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.dev.view.services.edit.reques
  t;singleton:=true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
+Bundle-Description: %pluginDescription
diff --git a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/build.properties b/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/build.properties
index 47c65cecef7..48b61a8c93e 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/build.properties
+++ b/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/build.properties
@@ -6,6 +6,5 @@ bin.includes = META-INF/,\
                icons/,\
                plugin.properties,\
                build.properties,\
-               plugin.pdoc,\
                about.html
 src.includes = about.html
diff --git a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/plugin.pdoc b/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/plugin.pdoc
deleted file mode 100644
index 68745e50edf..00000000000
--- a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides a vuiew to display all the requests sent to the Service Edit">
-  <referent firstName="Vincent" lastName="Lorenzo" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA-LIST"/>
-</doc:Documentation>
diff --git a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/plugin.properties b/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/plugin.properties
index 216649fb8aa..d12fd99e8b3 100644
--- a/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/plugin.properties
+++ b/plugins/developer/org.eclipse.papyrus.dev.view.services.edit.request/plugin.properties
@@ -2,4 +2,5 @@
 providerName = Eclipse Modeling Project
 pluginName = View for service edit requests
 view.name = Papyrus Service Edit Request View
-category.name = Papyrus Dev
-\ No newline at end of file
+category.name = Papyrus Dev
+pluginDescription=This plugin provides a vuiew to display all the requests sent to the Service Edit
+\ No newline at end of file
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/.classpath b/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/.classpath
deleted file mode 100644
index c1f31893de4..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src-gen"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/.project b/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/.project
deleted file mode 100644
index 0e8c3bdaedc..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.documentation.plugin.edit</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 94d61f00da6..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,291 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=260
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=false
-org.eclipse.jdt.core.formatter.join_wrapped_lines=false
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=260
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=false
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/.settings/org.eclipse.jdt.ui.prefs b/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 954281dbc31..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_Papyrus
-cleanup_settings_version=2
-eclipse.preferences.version=1
-formatter_profile=_Papyrus
-formatter_settings_version=12
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/META-INF/MANIFEST.MF
deleted file mode 100644
index ab1193ee888..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.papyrus.documentation.plugin;bundle-version="1.1.0";visibility:=reexport,
- org.eclipse.emf.edit;visibility:=reexport,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.edit;visibility:=reexport
-Export-Package: org.eclipse.papyrus.documentation.plugin.documentation
- .provider
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.1.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.documentation.plugin.documentati
- on.provider.PluginDocEditPlugin$Implementation
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.documentation.plugin.edit;sin
- gleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/about.html b/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/about.html
deleted file mode 100755
index 77ef6958f99..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>March, 2014</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/build.properties b/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/build.properties
deleted file mode 100644
index 775cf23db78..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/build.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-
-# <copyright>
-# </copyright>
-#
-# $Id$
-
-bin.includes = .,\
-               icons/,\
-               META-INF/,\
-               plugin.xml,\
-               plugin.properties
-jars.compile.order = .
-source.. = src-gen/
-output.. = bin/
-src.includes = about.html
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/icons/full/ctool16/CreateDocumentation_additionalComments_Comment.gif b/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/icons/full/ctool16/CreateDocumentation_additionalComments_Comment.gif
deleted file mode 100644
index e8324a2c6fd..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/icons/full/ctool16/CreateDocumentation_additionalComments_Comment.gif
+++ /dev/null
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/icons/full/ctool16/CreateDocumentation_implicitDependencies_Dependency.gif b/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/icons/full/ctool16/CreateDocumentation_implicitDependencies_Dependency.gif
deleted file mode 100644
index ff5397fa2a2..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/icons/full/ctool16/CreateDocumentation_implicitDependencies_Dependency.gif
+++ /dev/null
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/icons/full/ctool16/CreateDocumentation_implicitDependencies_FileDependency.gif b/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/icons/full/ctool16/CreateDocumentation_implicitDependencies_FileDependency.gif
deleted file mode 100644
index 37db3e582f3..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/icons/full/ctool16/CreateDocumentation_implicitDependencies_FileDependency.gif
+++ /dev/null
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/icons/full/ctool16/CreateDocumentation_referent_Person.gif b/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/icons/full/ctool16/CreateDocumentation_referent_Person.gif
deleted file mode 100644
index e7c430baac7..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/icons/full/ctool16/CreateDocumentation_referent_Person.gif
+++ /dev/null
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/icons/full/obj16/Comment.gif b/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/icons/full/obj16/Comment.gif
deleted file mode 100644
index 498364f1c1a..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/icons/full/obj16/Comment.gif
+++ /dev/null
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/icons/full/obj16/Dependency.gif b/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/icons/full/obj16/Dependency.gif
deleted file mode 100644
index 33a997a1606..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/icons/full/obj16/Dependency.gif
+++ /dev/null
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/icons/full/obj16/Documentation.gif b/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/icons/full/obj16/Documentation.gif
deleted file mode 100644
index 7c2aaac84ee..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/icons/full/obj16/Documentation.gif
+++ /dev/null
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/icons/full/obj16/FileDependency.gif b/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/icons/full/obj16/FileDependency.gif
deleted file mode 100644
index 45731fe28e7..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/icons/full/obj16/FileDependency.gif
+++ /dev/null
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/icons/full/obj16/Person.gif b/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/icons/full/obj16/Person.gif
deleted file mode 100644
index ea58a657dc0..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/icons/full/obj16/Person.gif
+++ /dev/null
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/plugin.properties b/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/plugin.properties
deleted file mode 100644
index b736b754eec..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/plugin.properties
+++ /dev/null
@@ -1,42 +0,0 @@
-
-# <copyright>
-# </copyright>
-#
-# $Id$
-
-pluginName = PluginDoc Edit Support
-providerName = Eclipse Modeling Project
-
-_UI_CreateChild_text = {0}
-_UI_CreateChild_text2 = {1} {0}
-_UI_CreateChild_text3 = {1}
-_UI_CreateChild_tooltip = Create New {0} Under {1} Feature
-_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.
-_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.
-
-_UI_PropertyDescriptor_description = The {0} of the {1}
-
-_UI_Documentation_type = Documentation
-_UI_Dependency_type = Dependency
-_UI_FileDependency_type = File Dependency
-_UI_Person_type = Person
-_UI_Comment_type = Comment
-_UI_Unknown_type = Object
-
-_UI_Unknown_datatype= Value
-
-_UI_Documentation_description_feature = Description
-_UI_Documentation_implicitDependencies_feature = Implicit Dependencies
-_UI_Documentation_referent_feature = Referent
-_UI_Documentation_additionalComments_feature = Additional Comments
-_UI_Dependency_plugin_feature = Plugin
-_UI_Dependency_comment_feature = Comment
-_UI_FileDependency_file_feature = File
-_UI_Person_firstName_feature = First Name
-_UI_Person_lastName_feature = Last Name
-_UI_Person_eMail_feature = EMail
-_UI_Person_currentCompany_feature = Current Company
-_UI_Comment_title_feature = Title
-_UI_Comment_contents_feature = Contents
-_UI_Unknown_feature = Unspecified
-
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/plugin.xml b/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/plugin.xml
deleted file mode 100644
index e55b670be07..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/plugin.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!--
- <copyright>
- </copyright>
-
- $Id$
--->
-
-<plugin>
-
-   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
-      <factory
-            uri="http://www.eclipse.org/papyrus/documentation/plugin/documentation"
-            class="org.eclipse.papyrus.documentation.plugin.documentation.provider.DocumentationItemProviderAdapterFactory"
-            supportedTypes=
-              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
-               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
-               org.eclipse.emf.edit.provider.ITreeItemContentProvider
-               org.eclipse.emf.edit.provider.IItemLabelProvider
-               org.eclipse.emf.edit.provider.IItemPropertySource"/>
-   </extension>
-
-</plugin>
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/pom.xml b/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/pom.xml
deleted file mode 100644
index 59ccd0ad1cc..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>org.eclipse.papyrus</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.1.0-SNAPSHOT</version>
-		<relativePath>../../../releng/top-pom-dev.xml</relativePath>
-	</parent>
-	<artifactId>org.eclipse.papyrus.documentation.plugin.edit</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.1.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
-\ No newline at end of file
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/provider/CommentItemProvider.java b/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/provider/CommentItemProvider.java
deleted file mode 100644
index f160dc885fa..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/provider/CommentItemProvider.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.documentation.plugin.documentation.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.provider.EModelElementItemProvider;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.documentation.plugin.documentation.Comment;
-import org.eclipse.papyrus.documentation.plugin.documentation.DocumentationPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.documentation.plugin.documentation.Comment} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class CommentItemProvider
-		extends EModelElementItemProvider
-		implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public CommentItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addTitlePropertyDescriptor(object);
-			addContentsPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Comment_title_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_Comment_title_feature", "_UI_Comment_type"),
-						DocumentationPackage.Literals.COMMENT__TITLE,
-						true,
-						false,
-						false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-						null,
-						null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Contents feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addContentsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Comment_contents_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_Comment_contents_feature", "_UI_Comment_type"),
-						DocumentationPackage.Literals.COMMENT__CONTENTS,
-						true,
-						true,
-						false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-						null,
-						null));
-	}
-
-	/**
-	 * This returns Comment.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Comment"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((Comment) object).getTitle();
-		return label == null || label.length() == 0 ?
-				getString("_UI_Comment_type") :
-				getString("_UI_Comment_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Comment.class)) {
-		case DocumentationPackage.COMMENT__TITLE:
-		case DocumentationPackage.COMMENT__CONTENTS:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return PluginDocEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/provider/DependencyItemProvider.java b/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/provider/DependencyItemProvider.java
deleted file mode 100644
index d749ca20071..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/provider/DependencyItemProvider.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.documentation.plugin.documentation.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.provider.EModelElementItemProvider;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.documentation.plugin.documentation.Dependency;
-import org.eclipse.papyrus.documentation.plugin.documentation.DocumentationPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.documentation.plugin.documentation.Dependency} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class DependencyItemProvider
-		extends EModelElementItemProvider
-		implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public DependencyItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addPluginPropertyDescriptor(object);
-			addCommentPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Plugin feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addPluginPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Dependency_plugin_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_Dependency_plugin_feature", "_UI_Dependency_type"),
-						DocumentationPackage.Literals.DEPENDENCY__PLUGIN,
-						true,
-						false,
-						false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-						null,
-						null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Comment feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addCommentPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Dependency_comment_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_Dependency_comment_feature", "_UI_Dependency_type"),
-						DocumentationPackage.Literals.DEPENDENCY__COMMENT,
-						true,
-						true,
-						false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-						null,
-						null));
-	}
-
-	/**
-	 * This returns Dependency.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Dependency"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((Dependency) object).getPlugin();
-		return label == null || label.length() == 0 ?
-				getString("_UI_Dependency_type") :
-				getString("_UI_Dependency_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Dependency.class)) {
-		case DocumentationPackage.DEPENDENCY__PLUGIN:
-		case DocumentationPackage.DEPENDENCY__COMMENT:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return PluginDocEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/provider/DocumentationItemProvider.java b/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/provider/DocumentationItemProvider.java
deleted file mode 100644
index 13e5ce2f298..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/provider/DocumentationItemProvider.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.documentation.plugin.documentation.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.provider.EModelElementItemProvider;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.documentation.plugin.documentation.Documentation;
-import org.eclipse.papyrus.documentation.plugin.documentation.DocumentationFactory;
-import org.eclipse.papyrus.documentation.plugin.documentation.DocumentationPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.documentation.plugin.documentation.Documentation} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class DocumentationItemProvider
-		extends EModelElementItemProvider
-		implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public DocumentationItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addDescriptionPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Description feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addDescriptionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Documentation_description_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_Documentation_description_feature", "_UI_Documentation_type"),
-						DocumentationPackage.Literals.DOCUMENTATION__DESCRIPTION,
-						true,
-						true,
-						false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-						null,
-						null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(DocumentationPackage.Literals.DOCUMENTATION__IMPLICIT_DEPENDENCIES);
-			childrenFeatures.add(DocumentationPackage.Literals.DOCUMENTATION__REFERENT);
-			childrenFeatures.add(DocumentationPackage.Literals.DOCUMENTATION__ADDITIONAL_COMMENTS);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns Documentation.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Documentation"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = crop(((Documentation) object).getDescription());
-		return label == null || label.length() == 0 ?
-				getString("_UI_Documentation_type") :
-				getString("_UI_Documentation_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Documentation.class)) {
-		case DocumentationPackage.DOCUMENTATION__DESCRIPTION:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-			return;
-		case DocumentationPackage.DOCUMENTATION__IMPLICIT_DEPENDENCIES:
-		case DocumentationPackage.DOCUMENTATION__REFERENT:
-		case DocumentationPackage.DOCUMENTATION__ADDITIONAL_COMMENTS:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-				(createChildParameter
-				(DocumentationPackage.Literals.DOCUMENTATION__IMPLICIT_DEPENDENCIES,
-						DocumentationFactory.eINSTANCE.createDependency()));
-
-		newChildDescriptors.add
-				(createChildParameter
-				(DocumentationPackage.Literals.DOCUMENTATION__IMPLICIT_DEPENDENCIES,
-						DocumentationFactory.eINSTANCE.createFileDependency()));
-
-		newChildDescriptors.add
-				(createChildParameter
-				(DocumentationPackage.Literals.DOCUMENTATION__REFERENT,
-						DocumentationFactory.eINSTANCE.createPerson()));
-
-		newChildDescriptors.add
-				(createChildParameter
-				(DocumentationPackage.Literals.DOCUMENTATION__ADDITIONAL_COMMENTS,
-						DocumentationFactory.eINSTANCE.createComment()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return PluginDocEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/provider/DocumentationItemProviderAdapterFactory.java b/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/provider/DocumentationItemProviderAdapterFactory.java
deleted file mode 100644
index 549261252b1..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/provider/DocumentationItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,337 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.documentation.plugin.documentation.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IDisposable;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.papyrus.documentation.plugin.documentation.util.DocumentationAdapterFactory;
-
-/**
- * This is the factory that is used to provide the interfaces needed to support Viewers.
- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
- * The adapters also support Eclipse property sheets.
- * Note that most of the adapters are shared among multiple instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class DocumentationItemProviderAdapterFactory extends DocumentationAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
-	/**
-	 * This keeps track of the root adapter factory that delegates to this adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected ComposedAdapterFactory parentAdapterFactory;
-
-	/**
-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
-	/**
-	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected Collection<Object> supportedTypes = new ArrayList<Object>();
-
-	/**
-	 * This constructs an instance.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public DocumentationItemProviderAdapterFactory() {
-		supportedTypes.add(IEditingDomainItemProvider.class);
-		supportedTypes.add(IStructuredItemContentProvider.class);
-		supportedTypes.add(ITreeItemContentProvider.class);
-		supportedTypes.add(IItemLabelProvider.class);
-		supportedTypes.add(IItemPropertySource.class);
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.documentation.plugin.documentation.Documentation} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected DocumentationItemProvider documentationItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.documentation.plugin.documentation.Documentation}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Adapter createDocumentationAdapter() {
-		if (documentationItemProvider == null) {
-			documentationItemProvider = new DocumentationItemProvider(this);
-		}
-
-		return documentationItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.documentation.plugin.documentation.Dependency} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected DependencyItemProvider dependencyItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.documentation.plugin.documentation.Dependency}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Adapter createDependencyAdapter() {
-		if (dependencyItemProvider == null) {
-			dependencyItemProvider = new DependencyItemProvider(this);
-		}
-
-		return dependencyItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.documentation.plugin.documentation.FileDependency} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected FileDependencyItemProvider fileDependencyItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.documentation.plugin.documentation.FileDependency}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Adapter createFileDependencyAdapter() {
-		if (fileDependencyItemProvider == null) {
-			fileDependencyItemProvider = new FileDependencyItemProvider(this);
-		}
-
-		return fileDependencyItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.documentation.plugin.documentation.Person} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected PersonItemProvider personItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.documentation.plugin.documentation.Person}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Adapter createPersonAdapter() {
-		if (personItemProvider == null) {
-			personItemProvider = new PersonItemProvider(this);
-		}
-
-		return personItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.documentation.plugin.documentation.Comment} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected CommentItemProvider commentItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.documentation.plugin.documentation.Comment}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Adapter createCommentAdapter() {
-		if (commentItemProvider == null) {
-			commentItemProvider = new CommentItemProvider(this);
-		}
-
-		return commentItemProvider;
-	}
-
-	/**
-	 * This returns the root adapter factory that contains this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public ComposeableAdapterFactory getRootAdapterFactory() {
-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
-	}
-
-	/**
-	 * This sets the composed adapter factory that contains this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
-		this.parentAdapterFactory = parentAdapterFactory;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object type) {
-		return supportedTypes.contains(type) || super.isFactoryForType(type);
-	}
-
-	/**
-	 * This implementation substitutes the factory itself as the key for the adapter.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Adapter adapt(Notifier notifier, Object type) {
-		return super.adapt(notifier, this);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object adapt(Object object, Object type) {
-		if (isFactoryForType(type)) {
-			Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {
-				return adapter;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * This adds a listener.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void addListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.addListener(notifyChangedListener);
-	}
-
-	/**
-	 * This removes a listener.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void removeListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.removeListener(notifyChangedListener);
-	}
-
-	/**
-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void fireNotifyChanged(Notification notification) {
-		changeNotifier.fireNotifyChanged(notification);
-
-		if (parentAdapterFactory != null) {
-			parentAdapterFactory.fireNotifyChanged(notification);
-		}
-	}
-
-	/**
-	 * This disposes all of the item providers created by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void dispose() {
-		if (documentationItemProvider != null) {
-			documentationItemProvider.dispose();
-		}
-		if (dependencyItemProvider != null) {
-			dependencyItemProvider.dispose();
-		}
-		if (fileDependencyItemProvider != null) {
-			fileDependencyItemProvider.dispose();
-		}
-		if (personItemProvider != null) {
-			personItemProvider.dispose();
-		}
-		if (commentItemProvider != null) {
-			commentItemProvider.dispose();
-		}
-	}
-
-}
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/provider/FileDependencyItemProvider.java b/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/provider/FileDependencyItemProvider.java
deleted file mode 100644
index 8b1cdad9e2a..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/provider/FileDependencyItemProvider.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.documentation.plugin.documentation.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.documentation.plugin.documentation.DocumentationPackage;
-import org.eclipse.papyrus.documentation.plugin.documentation.FileDependency;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.documentation.plugin.documentation.FileDependency} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class FileDependencyItemProvider
-		extends DependencyItemProvider
-		implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public FileDependencyItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addFilePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the File feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addFilePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_FileDependency_file_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_FileDependency_file_feature", "_UI_FileDependency_type"),
-						DocumentationPackage.Literals.FILE_DEPENDENCY__FILE,
-						true,
-						false,
-						false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-						null,
-						null));
-	}
-
-	/**
-	 * This returns FileDependency.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/FileDependency"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((FileDependency) object).getPlugin();
-		return label == null || label.length() == 0 ?
-				getString("_UI_FileDependency_type") :
-				getString("_UI_FileDependency_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(FileDependency.class)) {
-		case DocumentationPackage.FILE_DEPENDENCY__FILE:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/provider/PersonItemProvider.java b/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/provider/PersonItemProvider.java
deleted file mode 100644
index d5f87ea03b1..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/provider/PersonItemProvider.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.documentation.plugin.documentation.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.provider.EModelElementItemProvider;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.documentation.plugin.documentation.DocumentationPackage;
-import org.eclipse.papyrus.documentation.plugin.documentation.Person;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.documentation.plugin.documentation.Person} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class PersonItemProvider
-		extends EModelElementItemProvider
-		implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public PersonItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addFirstNamePropertyDescriptor(object);
-			addLastNamePropertyDescriptor(object);
-			addEMailPropertyDescriptor(object);
-			addCurrentCompanyPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the First Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addFirstNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Person_firstName_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_Person_firstName_feature", "_UI_Person_type"),
-						DocumentationPackage.Literals.PERSON__FIRST_NAME,
-						true,
-						false,
-						false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-						null,
-						null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Last Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addLastNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Person_lastName_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_Person_lastName_feature", "_UI_Person_type"),
-						DocumentationPackage.Literals.PERSON__LAST_NAME,
-						true,
-						false,
-						false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-						null,
-						null));
-	}
-
-	/**
-	 * This adds a property descriptor for the EMail feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addEMailPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Person_eMail_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_Person_eMail_feature", "_UI_Person_type"),
-						DocumentationPackage.Literals.PERSON__EMAIL,
-						true,
-						false,
-						false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-						null,
-						null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Current Company feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void addCurrentCompanyPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-				(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-						getResourceLocator(),
-						getString("_UI_Person_currentCompany_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_Person_currentCompany_feature", "_UI_Person_type"),
-						DocumentationPackage.Literals.PERSON__CURRENT_COMPANY,
-						true,
-						false,
-						false,
-						ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-						null,
-						null));
-	}
-
-	/**
-	 * This returns Person.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Person"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((Person) object).getFirstName();
-		return label == null || label.length() == 0 ?
-				getString("_UI_Person_type") :
-				getString("_UI_Person_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Person.class)) {
-		case DocumentationPackage.PERSON__FIRST_NAME:
-		case DocumentationPackage.PERSON__LAST_NAME:
-		case DocumentationPackage.PERSON__EMAIL:
-		case DocumentationPackage.PERSON__CURRENT_COMPANY:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return PluginDocEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/provider/PluginDocEditPlugin.java b/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/provider/PluginDocEditPlugin.java
deleted file mode 100644
index cfd07a17028..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.edit/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/provider/PluginDocEditPlugin.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.documentation.plugin.documentation.provider;
-
-import org.eclipse.emf.common.EMFPlugin;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
-
-/**
- * This is the central singleton for the PluginDoc edit plugin.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public final class PluginDocEditPlugin extends EMFPlugin {
-	/**
-	 * Keep track of the singleton.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public static final PluginDocEditPlugin INSTANCE = new PluginDocEditPlugin();
-
-	/**
-	 * Keep track of the singleton.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private static Implementation plugin;
-
-	/**
-	 * Create the instance.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public PluginDocEditPlugin() {
-		super(new ResourceLocator[] {
-				EcoreEditPlugin.INSTANCE,
-		});
-	}
-
-	/**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the singleton instance.
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getPluginResourceLocator() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the singleton instance.
-	 * @generated
-	 */
-	public static Implementation getPlugin() {
-		return plugin;
-	}
-
-	/**
-	 * The actual implementation of the Eclipse <b>Plugin</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public static class Implementation extends EclipsePlugin {
-		/**
-		 * Creates an instance.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		public Implementation() {
-			super();
-
-			// Remember the static instance.
-			//
-			plugin = this;
-		}
-	}
-
-}
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/.classpath b/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/.classpath
deleted file mode 100644
index c1f31893de4..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src-gen"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/.project b/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/.project
deleted file mode 100644
index acf76b2f55e..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.documentation.plugin.editor</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/.settings/org.eclipse.jdt.core.prefs b/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 94d61f00da6..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,291 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=260
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=false
-org.eclipse.jdt.core.formatter.join_wrapped_lines=false
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=260
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=false
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/.settings/org.eclipse.jdt.ui.prefs b/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 954281dbc31..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_Papyrus
-cleanup_settings_version=2
-eclipse.preferences.version=1
-formatter_profile=_Papyrus
-formatter_settings_version=12
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/META-INF/MANIFEST.MF
deleted file mode 100644
index 337c3dd83ef..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,23 +0,0 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources;visibility:=reexport,
- org.eclipse.papyrus.documentation.plugin.edit;bundle-version="1.1.0";visibility:=reexport,
- org.eclipse.emf.ecore.xmi;visibility:=reexport,
- org.eclipse.emf.edit.ui;visibility:=reexport,
- org.eclipse.ui.ide;visibility:=reexport,
- org.eclipse.emf.ecore.edit;visibility:=reexport
-Export-Package: org.eclipse.papyrus.documentation.plugin.documentation
- .presentation
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.1.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.documentation.plugin.documentati
- on.presentation.PluginDocEditorPlugin$Implementation
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.documentation.plugin.editor;s
- ingleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/about.html b/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/about.html
deleted file mode 100755
index 77ef6958f99..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>March, 2014</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/build.properties b/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/build.properties
deleted file mode 100644
index be1f0346538..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/build.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-
-# <copyright>
-# </copyright>
-#
-# $Id$
-
-bin.includes = .,\
-               icons/,\
-               META-INF/,\
-               plugin.xml,\
-               plugin.properties
-jars.compile.order = .
-source.. = src-gen/
-output.. = bin
-src.includes = about.html
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/icons/full/obj16/DocumentationModelFile.gif b/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/icons/full/obj16/DocumentationModelFile.gif
deleted file mode 100644
index 7a1962eb8e5..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/icons/full/obj16/DocumentationModelFile.gif
+++ /dev/null
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/icons/full/wizban/NewDocumentation.gif b/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/icons/full/wizban/NewDocumentation.gif
deleted file mode 100644
index 285c8eb1b14..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/icons/full/wizban/NewDocumentation.gif
+++ /dev/null
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/plugin.properties b/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/plugin.properties
deleted file mode 100644
index 009f91da6db..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/plugin.properties
+++ /dev/null
@@ -1,57 +0,0 @@
-
-# <copyright>
-# </copyright>
-#
-# $Id$
-
-pluginName = PluginDoc Editor
-providerName = Eclipse Modeling Project
-
-_UI_DocumentationEditor_menu = &Documentation Editor
-
-_UI_CreateChild_menu_item = &New Child
-_UI_CreateSibling_menu_item = N&ew Sibling
-
-_UI_ShowPropertiesView_menu_item = Show &Properties View
-_UI_RefreshViewer_menu_item = &Refresh
-
-_UI_SelectionPage_label = Selection
-_UI_ParentPage_label = Parent
-_UI_ListPage_label = List
-_UI_TreePage_label = Tree
-_UI_TablePage_label = Table
-_UI_TreeWithColumnsPage_label = Tree with Columns
-_UI_ObjectColumn_label = Object
-_UI_SelfColumn_label = Self
-
-_UI_NoObjectSelected = Selected Nothing
-_UI_SingleObjectSelected = Selected Object: {0}
-_UI_MultiObjectSelected = Selected {0} Objects
-
-_UI_OpenEditorError_label = Open Editor
-
-_UI_Wizard_category = Example EMF Model Creation Wizards
-
-_UI_CreateModelError_message = Problems encountered in file "{0}"
-
-_UI_DocumentationModelWizard_label = Documentation Model
-_UI_DocumentationModelWizard_description = Create a new Documentation model
-
-_UI_DocumentationEditor_label = Documentation Model Editor
-
-_UI_DocumentationEditorFilenameDefaultBase = My
-_UI_DocumentationEditorFilenameExtensions = pdoc
-
-_UI_Wizard_label = New
-
-_WARN_FilenameExtension = The file name must end in ''.{0}''
-_WARN_FilenameExtensions = The file name must have one of the following extensions: {0}
-
-_UI_ModelObject = &Model Object
-_UI_XMLEncoding = &XML Encoding
-_UI_XMLEncodingChoices = UTF-8
-_UI_Wizard_initial_object_description = Select a model object to create
-
-_UI_FileConflict_label = File Conflict
-_WARN_FileConflict = There are unsaved changes that conflict with changes made outside the editor.  Do you wish to discard this editor's changes?
-
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/plugin.xml b/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/plugin.xml
deleted file mode 100644
index 8a2b1129537..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/plugin.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!--
- <copyright>
- </copyright>
-
- $Id$
--->
-
-<plugin>
-
-   <extension point="org.eclipse.ui.newWizards">
-      <category
-            id="org.eclipse.emf.ecore.Wizard.category.ID"
-            name="%_UI_Wizard_category"/>
-      <wizard
-            id="org.eclipse.papyrus.documentation.plugin.documentation.presentation.DocumentationModelWizardID"
-            name="%_UI_DocumentationModelWizard_label"
-            class="org.eclipse.papyrus.documentation.plugin.documentation.presentation.DocumentationModelWizard"
-            category="org.eclipse.emf.ecore.Wizard.category.ID"
-            icon="icons/full/obj16/DocumentationModelFile.gif">
-         <description>%_UI_DocumentationModelWizard_description</description>
-         <selection class="org.eclipse.core.resources.IResource"/>
-      </wizard>
-   </extension>
-
-   <extension point="org.eclipse.ui.editors">
-      <editor
-            id="org.eclipse.papyrus.documentation.plugin.documentation.presentation.DocumentationEditorID"
-            name="%_UI_DocumentationEditor_label"
-            icon="icons/full/obj16/DocumentationModelFile.gif"
-            extensions="pdoc"
-            class="org.eclipse.papyrus.documentation.plugin.documentation.presentation.DocumentationEditor"
-            contributorClass="org.eclipse.papyrus.documentation.plugin.documentation.presentation.DocumentationActionBarContributor">
-      </editor>
-   </extension>
-
-</plugin>
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/presentation/DocumentationActionBarContributor.java b/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/presentation/DocumentationActionBarContributor.java
deleted file mode 100644
index 23049299578..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/presentation/DocumentationActionBarContributor.java
+++ /dev/null
@@ -1,445 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.documentation.plugin.documentation.presentation;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.ui.viewer.IViewerProvider;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-import org.eclipse.emf.edit.ui.action.ControlAction;
-import org.eclipse.emf.edit.ui.action.CreateChildAction;
-import org.eclipse.emf.edit.ui.action.CreateSiblingAction;
-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
-import org.eclipse.emf.edit.ui.action.LoadResourceAction;
-import org.eclipse.emf.edit.ui.action.ValidateAction;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.action.IContributionManager;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.action.SubContributionItem;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PartInitException;
-
-/**
- * This is the action bar contributor for the Documentation model editor.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class DocumentationActionBarContributor
-		extends EditingDomainActionBarContributor
-		implements ISelectionChangedListener {
-	/**
-	 * This keeps track of the active editor.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected IEditorPart activeEditorPart;
-
-	/**
-	 * This keeps track of the current selection provider.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected ISelectionProvider selectionProvider;
-
-	/**
-	 * This action opens the Properties view.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected IAction showPropertiesViewAction =
-			new Action(PluginDocEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) {
-				@Override
-				public void run() {
-					try {
-						getPage().showView("org.eclipse.ui.views.PropertySheet");
-					}
-					catch (PartInitException exception) {
-						PluginDocEditorPlugin.INSTANCE.log(exception);
-					}
-				}
-			};
-
-	/**
-	 * This action refreshes the viewer of the current editor if the editor
-	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected IAction refreshViewerAction =
-			new Action(PluginDocEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) {
-				@Override
-				public boolean isEnabled() {
-					return activeEditorPart instanceof IViewerProvider;
-				}
-
-				@Override
-				public void run() {
-					if (activeEditorPart instanceof IViewerProvider) {
-						Viewer viewer = ((IViewerProvider) activeEditorPart).getViewer();
-						if (viewer != null) {
-							viewer.refresh();
-						}
-					}
-				}
-			};
-
-	/**
-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor
-	 * generated for the current selection by the item provider.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected Collection<IAction> createChildActions;
-
-	/**
-	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected IMenuManager createChildMenuManager;
-
-	/**
-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor
-	 * generated for the current selection by the item provider.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected Collection<IAction> createSiblingActions;
-
-	/**
-	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected IMenuManager createSiblingMenuManager;
-
-	/**
-	 * This creates an instance of the contributor.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public DocumentationActionBarContributor() {
-		super(ADDITIONS_LAST_STYLE);
-		loadResourceAction = new LoadResourceAction();
-		validateAction = new ValidateAction();
-		controlAction = new ControlAction();
-	}
-
-	/**
-	 * This adds Separators for editor additions to the tool bar.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void contributeToToolBar(IToolBarManager toolBarManager) {
-		toolBarManager.add(new Separator("documentation-settings"));
-		toolBarManager.add(new Separator("documentation-additions"));
-	}
-
-	/**
-	 * This adds to the menu bar a menu and some separators for editor additions,
-	 * as well as the sub-menus for object creation items.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void contributeToMenu(IMenuManager menuManager) {
-		super.contributeToMenu(menuManager);
-
-		IMenuManager submenuManager = new MenuManager(PluginDocEditorPlugin.INSTANCE.getString("_UI_DocumentationEditor_menu"), "org.eclipse.papyrus.documentation.plugin.documentationMenuID");
-		menuManager.insertAfter("additions", submenuManager);
-		submenuManager.add(new Separator("settings"));
-		submenuManager.add(new Separator("actions"));
-		submenuManager.add(new Separator("additions"));
-		submenuManager.add(new Separator("additions-end"));
-
-		// Prepare for CreateChild item addition or removal.
-		//
-		createChildMenuManager = new MenuManager(PluginDocEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));
-		submenuManager.insertBefore("additions", createChildMenuManager);
-
-		// Prepare for CreateSibling item addition or removal.
-		//
-		createSiblingMenuManager = new MenuManager(PluginDocEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
-		submenuManager.insertBefore("additions", createSiblingMenuManager);
-
-		// Force an update because Eclipse hides empty menus now.
-		//
-		submenuManager.addMenuListener
-				(new IMenuListener() {
-					@Override
-					public void menuAboutToShow(IMenuManager menuManager) {
-						menuManager.updateAll(true);
-					}
-				});
-
-		addGlobalActions(submenuManager);
-	}
-
-	/**
-	 * When the active editor changes, this remembers the change and registers with it as a selection provider.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void setActiveEditor(IEditorPart part) {
-		super.setActiveEditor(part);
-		activeEditorPart = part;
-
-		// Switch to the new selection provider.
-		//
-		if (selectionProvider != null) {
-			selectionProvider.removeSelectionChangedListener(this);
-		}
-		if (part == null) {
-			selectionProvider = null;
-		}
-		else {
-			selectionProvider = part.getSite().getSelectionProvider();
-			selectionProvider.addSelectionChangedListener(this);
-
-			// Fake a selection changed event to update the menus.
-			//
-			if (selectionProvider.getSelection() != null) {
-				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));
-			}
-		}
-	}
-
-	/**
-	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},
-	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings
-	 * that can be added to the selected object and updating the menus accordingly.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void selectionChanged(SelectionChangedEvent event) {
-		// Remove any menu items for old selection.
-		//
-		if (createChildMenuManager != null) {
-			depopulateManager(createChildMenuManager, createChildActions);
-		}
-		if (createSiblingMenuManager != null) {
-			depopulateManager(createSiblingMenuManager, createSiblingActions);
-		}
-
-		// Query the new selection for appropriate new child/sibling descriptors
-		//
-		Collection<?> newChildDescriptors = null;
-		Collection<?> newSiblingDescriptors = null;
-
-		ISelection selection = event.getSelection();
-		if (selection instanceof IStructuredSelection && ((IStructuredSelection) selection).size() == 1) {
-			Object object = ((IStructuredSelection) selection).getFirstElement();
-
-			EditingDomain domain = ((IEditingDomainProvider) activeEditorPart).getEditingDomain();
-
-			newChildDescriptors = domain.getNewChildDescriptors(object, null);
-			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);
-		}
-
-		// Generate actions for selection; populate and redraw the menus.
-		//
-		createChildActions = generateCreateChildActions(newChildDescriptors, selection);
-		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);
-
-		if (createChildMenuManager != null) {
-			populateManager(createChildMenuManager, createChildActions, null);
-			createChildMenuManager.update(true);
-		}
-		if (createSiblingMenuManager != null) {
-			populateManager(createSiblingMenuManager, createSiblingActions, null);
-			createSiblingMenuManager.update(true);
-		}
-	}
-
-	/**
-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,
-	 * and returns the collection of these actions.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
-		Collection<IAction> actions = new ArrayList<IAction>();
-		if (descriptors != null) {
-			for (Object descriptor : descriptors) {
-				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));
-			}
-		}
-		return actions;
-	}
-
-	/**
-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,
-	 * and returns the collection of these actions.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
-		Collection<IAction> actions = new ArrayList<IAction>();
-		if (descriptors != null) {
-			for (Object descriptor : descriptors) {
-				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));
-			}
-		}
-		return actions;
-	}
-
-	/**
-	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s
-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,
-	 * by inserting them before the specified contribution item <code>contributionID</code>.
-	 * If <code>contributionID</code> is <code>null</code>, they are simply added.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {
-		if (actions != null) {
-			for (IAction action : actions) {
-				if (contributionID != null) {
-					manager.insertBefore(contributionID, action);
-				}
-				else {
-					manager.add(action);
-				}
-			}
-		}
-	}
-
-	/**
-	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s
-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {
-		if (actions != null) {
-			IContributionItem[] items = manager.getItems();
-			for (int i = 0; i < items.length; i++) {
-				// Look into SubContributionItems
-				//
-				IContributionItem contributionItem = items[i];
-				while (contributionItem instanceof SubContributionItem) {
-					contributionItem = ((SubContributionItem) contributionItem).getInnerItem();
-				}
-
-				// Delete the ActionContributionItems with matching action.
-				//
-				if (contributionItem instanceof ActionContributionItem) {
-					IAction action = ((ActionContributionItem) contributionItem).getAction();
-					if (actions.contains(action)) {
-						manager.remove(contributionItem);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * This populates the pop-up menu before it appears.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void menuAboutToShow(IMenuManager menuManager) {
-		super.menuAboutToShow(menuManager);
-		MenuManager submenuManager = null;
-
-		submenuManager = new MenuManager(PluginDocEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));
-		populateManager(submenuManager, createChildActions, null);
-		menuManager.insertBefore("edit", submenuManager);
-
-		submenuManager = new MenuManager(PluginDocEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
-		populateManager(submenuManager, createSiblingActions, null);
-		menuManager.insertBefore("edit", submenuManager);
-	}
-
-	/**
-	 * This inserts global actions before the "additions-end" separator.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void addGlobalActions(IMenuManager menuManager) {
-		menuManager.insertAfter("additions-end", new Separator("ui-actions"));
-		menuManager.insertAfter("ui-actions", showPropertiesViewAction);
-
-		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());
-		menuManager.insertAfter("ui-actions", refreshViewerAction);
-
-		super.addGlobalActions(menuManager);
-	}
-
-	/**
-	 * This ensures that a delete action will clean up all references to deleted objects.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected boolean removeAllReferencesOnDelete() {
-		return true;
-	}
-
-}
-\ No newline at end of file
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/presentation/DocumentationEditor.java b/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/presentation/DocumentationEditor.java
deleted file mode 100644
index 150eb5ff934..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/presentation/DocumentationEditor.java
+++ /dev/null
@@ -1,1883 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.documentation.plugin.documentation.presentation;
-
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.EventObject;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.common.command.BasicCommandStack;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CommandStack;
-import org.eclipse.emf.common.command.CommandStackListener;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.ui.MarkerHelper;
-import org.eclipse.emf.common.ui.ViewerPane;
-import org.eclipse.emf.common.ui.editor.ProblemEditorPart;
-import org.eclipse.emf.common.ui.viewer.IViewerProvider;
-import org.eclipse.emf.common.util.BasicDiagnostic;
-import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EValidator;
-import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EContentAdapter;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
-import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;
-import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;
-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
-import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;
-import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;
-import org.eclipse.emf.edit.ui.util.EditUIUtil;
-import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IStatusLineManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ListViewer;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.papyrus.documentation.plugin.documentation.provider.DocumentationItemProviderAdapterFactory;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CTabFolder;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.events.ControlAdapter;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeColumn;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.dialogs.SaveAsDialog;
-import org.eclipse.ui.ide.IGotoMarker;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.part.MultiPageEditorPart;
-import org.eclipse.ui.views.contentoutline.ContentOutline;
-import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-import org.eclipse.ui.views.properties.IPropertySheetPage;
-import org.eclipse.ui.views.properties.PropertySheet;
-import org.eclipse.ui.views.properties.PropertySheetPage;
-
-
-/**
- * This is an example of a Documentation model editor.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class DocumentationEditor
-		extends MultiPageEditorPart
-		implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {
-	/**
-	 * This keeps track of the editing domain that is used to track all changes to the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected AdapterFactoryEditingDomain editingDomain;
-
-	/**
-	 * This is the one adapter factory used for providing views of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected ComposedAdapterFactory adapterFactory;
-
-	/**
-	 * This is the content outline page.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected IContentOutlinePage contentOutlinePage;
-
-	/**
-	 * This is a kludge...
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected IStatusLineManager contentOutlineStatusLineManager;
-
-	/**
-	 * This is the content outline page's viewer.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected TreeViewer contentOutlineViewer;
-
-	/**
-	 * This is the property sheet page.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected PropertySheetPage propertySheetPage;
-
-	/**
-	 * This is the viewer that shadows the selection in the content outline.
-	 * The parent relation must be correctly defined for this to work.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected TreeViewer selectionViewer;
-
-	/**
-	 * This inverts the roll of parent and child in the content provider and show parents as a tree.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected TreeViewer parentViewer;
-
-	/**
-	 * This shows how a tree view works.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected TreeViewer treeViewer;
-
-	/**
-	 * This shows how a list view works.
-	 * A list viewer doesn't support icons.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected ListViewer listViewer;
-
-	/**
-	 * This shows how a table view works.
-	 * A table can be used as a list with icons.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected TableViewer tableViewer;
-
-	/**
-	 * This shows how a tree view with columns works.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected TreeViewer treeViewerWithColumns;
-
-	/**
-	 * This keeps track of the active viewer pane, in the book.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected ViewerPane currentViewerPane;
-
-	/**
-	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected Viewer currentViewer;
-
-	/**
-	 * This listens to which ever viewer is active.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected ISelectionChangedListener selectionChangedListener;
-
-	/**
-	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();
-
-	/**
-	 * This keeps track of the selection of the editor as a whole.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected ISelection editorSelection = StructuredSelection.EMPTY;
-
-	/**
-	 * The MarkerHelper is responsible for creating workspace resource markers presented
-	 * in Eclipse's Problems View.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected MarkerHelper markerHelper = new EditUIMarkerHelper();
-
-	/**
-	 * This listens for when the outline becomes active
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected IPartListener partListener =
-			new IPartListener() {
-				@Override
-				public void partActivated(IWorkbenchPart p) {
-					if (p instanceof ContentOutline) {
-						if (((ContentOutline) p).getCurrentPage() == contentOutlinePage) {
-							getActionBarContributor().setActiveEditor(DocumentationEditor.this);
-
-							setCurrentViewer(contentOutlineViewer);
-						}
-					}
-					else if (p instanceof PropertySheet) {
-						if (((PropertySheet) p).getCurrentPage() == propertySheetPage) {
-							getActionBarContributor().setActiveEditor(DocumentationEditor.this);
-							handleActivate();
-						}
-					}
-					else if (p == DocumentationEditor.this) {
-						handleActivate();
-					}
-				}
-
-				@Override
-				public void partBroughtToTop(IWorkbenchPart p) {
-					// Ignore.
-				}
-
-				@Override
-				public void partClosed(IWorkbenchPart p) {
-					// Ignore.
-				}
-
-				@Override
-				public void partDeactivated(IWorkbenchPart p) {
-					// Ignore.
-				}
-
-				@Override
-				public void partOpened(IWorkbenchPart p) {
-					// Ignore.
-				}
-			};
-
-	/**
-	 * Resources that have been removed since last activation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected Collection<Resource> removedResources = new ArrayList<Resource>();
-
-	/**
-	 * Resources that have been changed since last activation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected Collection<Resource> changedResources = new ArrayList<Resource>();
-
-	/**
-	 * Resources that have been saved.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected Collection<Resource> savedResources = new ArrayList<Resource>();
-
-	/**
-	 * Map to store the diagnostic associated with a resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();
-
-	/**
-	 * Controls whether the problem indication should be updated.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected boolean updateProblemIndication = true;
-
-	/**
-	 * Adapter used to update the problem indication when resources are demanded loaded.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected EContentAdapter problemIndicationAdapter =
-			new EContentAdapter() {
-				@Override
-				public void notifyChanged(Notification notification) {
-					if (notification.getNotifier() instanceof Resource) {
-						switch (notification.getFeatureID(Resource.class)) {
-						case Resource.RESOURCE__IS_LOADED:
-						case Resource.RESOURCE__ERRORS:
-						case Resource.RESOURCE__WARNINGS: {
-							Resource resource = (Resource) notification.getNotifier();
-							Diagnostic diagnostic = analyzeResourceProblems(resource, null);
-							if (diagnostic.getSeverity() != Diagnostic.OK) {
-								resourceToDiagnosticMap.put(resource, diagnostic);
-							}
-							else {
-								resourceToDiagnosticMap.remove(resource);
-							}
-
-							if (updateProblemIndication) {
-								getSite().getShell().getDisplay().asyncExec
-										(new Runnable() {
-											@Override
-											public void run() {
-												updateProblemIndication();
-											}
-										});
-							}
-							break;
-						}
-						}
-					}
-					else {
-						super.notifyChanged(notification);
-					}
-				}
-
-				@Override
-				protected void setTarget(Resource target) {
-					basicSetTarget(target);
-				}
-
-				@Override
-				protected void unsetTarget(Resource target) {
-					basicUnsetTarget(target);
-				}
-			};
-
-	/**
-	 * This listens for workspace changes.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected IResourceChangeListener resourceChangeListener =
-			new IResourceChangeListener() {
-				@Override
-				public void resourceChanged(IResourceChangeEvent event) {
-					IResourceDelta delta = event.getDelta();
-					try {
-						class ResourceDeltaVisitor implements IResourceDeltaVisitor {
-							protected ResourceSet resourceSet = editingDomain.getResourceSet();
-							protected Collection<Resource> changedResources = new ArrayList<Resource>();
-							protected Collection<Resource> removedResources = new ArrayList<Resource>();
-
-							@Override
-							public boolean visit(IResourceDelta delta) {
-								if (delta.getResource().getType() == IResource.FILE) {
-									if (delta.getKind() == IResourceDelta.REMOVED ||
-											delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {
-										Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
-										if (resource != null) {
-											if (delta.getKind() == IResourceDelta.REMOVED) {
-												removedResources.add(resource);
-											}
-											else if (!savedResources.remove(resource)) {
-												changedResources.add(resource);
-											}
-										}
-									}
-								}
-
-								return true;
-							}
-
-							public Collection<Resource> getChangedResources() {
-								return changedResources;
-							}
-
-							public Collection<Resource> getRemovedResources() {
-								return removedResources;
-							}
-						}
-
-						final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();
-						delta.accept(visitor);
-
-						if (!visitor.getRemovedResources().isEmpty()) {
-							getSite().getShell().getDisplay().asyncExec
-									(new Runnable() {
-										@Override
-										public void run() {
-											removedResources.addAll(visitor.getRemovedResources());
-											if (!isDirty()) {
-												getSite().getPage().closeEditor(DocumentationEditor.this, false);
-											}
-										}
-									});
-						}
-
-						if (!visitor.getChangedResources().isEmpty()) {
-							getSite().getShell().getDisplay().asyncExec
-									(new Runnable() {
-										@Override
-										public void run() {
-											changedResources.addAll(visitor.getChangedResources());
-											if (getSite().getPage().getActiveEditor() == DocumentationEditor.this) {
-												handleActivate();
-											}
-										}
-									});
-						}
-					}
-					catch (CoreException exception) {
-						PluginDocEditorPlugin.INSTANCE.log(exception);
-					}
-				}
-			};
-
-	/**
-	 * Handles activation of the editor or it's associated views.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void handleActivate() {
-		// Recompute the read only state.
-		//
-		if (editingDomain.getResourceToReadOnlyMap() != null) {
-			editingDomain.getResourceToReadOnlyMap().clear();
-
-			// Refresh any actions that may become enabled or disabled.
-			//
-			setSelection(getSelection());
-		}
-
-		if (!removedResources.isEmpty()) {
-			if (handleDirtyConflict()) {
-				getSite().getPage().closeEditor(DocumentationEditor.this, false);
-			}
-			else {
-				removedResources.clear();
-				changedResources.clear();
-				savedResources.clear();
-			}
-		}
-		else if (!changedResources.isEmpty()) {
-			changedResources.removeAll(savedResources);
-			handleChangedResources();
-			changedResources.clear();
-			savedResources.clear();
-		}
-	}
-
-	/**
-	 * Handles what to do with changed resources on activation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void handleChangedResources() {
-		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {
-			if (isDirty()) {
-				changedResources.addAll(editingDomain.getResourceSet().getResources());
-			}
-			editingDomain.getCommandStack().flush();
-
-			updateProblemIndication = false;
-			for (Resource resource : changedResources) {
-				if (resource.isLoaded()) {
-					resource.unload();
-					try {
-						resource.load(Collections.EMPTY_MAP);
-					} catch (IOException exception) {
-						if (!resourceToDiagnosticMap.containsKey(resource)) {
-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
-						}
-					}
-				}
-			}
-
-			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {
-				setSelection(StructuredSelection.EMPTY);
-			}
-
-			updateProblemIndication = true;
-			updateProblemIndication();
-		}
-	}
-
-	/**
-	 * Updates the problems indication with the information described in the specified diagnostic.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void updateProblemIndication() {
-		if (updateProblemIndication) {
-			BasicDiagnostic diagnostic =
-					new BasicDiagnostic
-					(Diagnostic.OK,
-							"org.eclipse.papyrus.documentation.plugin.editor",
-							0,
-							null,
-							new Object[] { editingDomain.getResourceSet() });
-			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {
-				if (childDiagnostic.getSeverity() != Diagnostic.OK) {
-					diagnostic.add(childDiagnostic);
-				}
-			}
-
-			int lastEditorPage = getPageCount() - 1;
-			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {
-				((ProblemEditorPart) getEditor(lastEditorPage)).setDiagnostic(diagnostic);
-				if (diagnostic.getSeverity() != Diagnostic.OK) {
-					setActivePage(lastEditorPage);
-				}
-			}
-			else if (diagnostic.getSeverity() != Diagnostic.OK) {
-				ProblemEditorPart problemEditorPart = new ProblemEditorPart();
-				problemEditorPart.setDiagnostic(diagnostic);
-				problemEditorPart.setMarkerHelper(markerHelper);
-				try {
-					addPage(++lastEditorPage, problemEditorPart, getEditorInput());
-					setPageText(lastEditorPage, problemEditorPart.getPartName());
-					setActivePage(lastEditorPage);
-					showTabs();
-				} catch (PartInitException exception) {
-					PluginDocEditorPlugin.INSTANCE.log(exception);
-				}
-			}
-
-			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {
-				markerHelper.deleteMarkers(editingDomain.getResourceSet());
-				if (diagnostic.getSeverity() != Diagnostic.OK) {
-					try {
-						markerHelper.createMarkers(diagnostic);
-					} catch (CoreException exception) {
-						PluginDocEditorPlugin.INSTANCE.log(exception);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Shows a dialog that asks if conflicting changes should be discarded.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected boolean handleDirtyConflict() {
-		return MessageDialog.openQuestion
-				(getSite().getShell(),
-						getString("_UI_FileConflict_label"),
-						getString("_WARN_FileConflict"));
-	}
-
-	/**
-	 * This creates a model editor.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public DocumentationEditor() {
-		super();
-		initializeEditingDomain();
-	}
-
-	/**
-	 * This sets up the editing domain for the model editor.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void initializeEditingDomain() {
-		// Create an adapter factory that yields item providers.
-		//
-		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
-
-		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
-		adapterFactory.addAdapterFactory(new DocumentationItemProviderAdapterFactory());
-		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());
-		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
-
-		// Create the command stack that will notify this editor as commands are executed.
-		//
-		BasicCommandStack commandStack = new BasicCommandStack();
-
-		// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.
-		//
-		commandStack.addCommandStackListener
-				(new CommandStackListener() {
-					@Override
-					public void commandStackChanged(final EventObject event) {
-						getContainer().getDisplay().asyncExec
-								(new Runnable() {
-									@Override
-									public void run() {
-										firePropertyChange(IEditorPart.PROP_DIRTY);
-
-										// Try to select the affected objects.
-										//
-										Command mostRecentCommand = ((CommandStack) event.getSource()).getMostRecentCommand();
-										if (mostRecentCommand != null) {
-											setSelectionToViewer(mostRecentCommand.getAffectedObjects());
-										}
-										if (propertySheetPage != null && !propertySheetPage.getControl().isDisposed()) {
-											propertySheetPage.refresh();
-										}
-									}
-								});
-					}
-				});
-
-		// Create the editing domain with a special command stack.
-		//
-		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());
-	}
-
-	/**
-	 * This is here for the listener to be able to call it.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void firePropertyChange(int action) {
-		super.firePropertyChange(action);
-	}
-
-	/**
-	 * This sets the selection into whichever viewer is active.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void setSelectionToViewer(Collection<?> collection) {
-		final Collection<?> theSelection = collection;
-		// Make sure it's okay.
-		//
-		if (theSelection != null && !theSelection.isEmpty()) {
-			Runnable runnable =
-					new Runnable() {
-						@Override
-						public void run() {
-							// Try to select the items in the current content viewer of the editor.
-							//
-							if (currentViewer != null) {
-								currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);
-							}
-						}
-					};
-			getSite().getShell().getDisplay().asyncExec(runnable);
-		}
-	}
-
-	/**
-	 * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.
-	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain} and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public EditingDomain getEditingDomain() {
-		return editingDomain;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
-			super(adapterFactory);
-		}
-
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		@Override
-		public Object[] getElements(Object object) {
-			Object parent = super.getParent(object);
-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
-		}
-
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		@Override
-		public Object[] getChildren(Object object) {
-			Object parent = super.getParent(object);
-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
-		}
-
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		@Override
-		public boolean hasChildren(Object object) {
-			Object parent = super.getParent(object);
-			return parent != null;
-		}
-
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		@Override
-		public Object getParent(Object object) {
-			return null;
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void setCurrentViewerPane(ViewerPane viewerPane) {
-		if (currentViewerPane != viewerPane) {
-			if (currentViewerPane != null) {
-				currentViewerPane.showFocus(false);
-			}
-			currentViewerPane = viewerPane;
-		}
-		setCurrentViewer(currentViewerPane.getViewer());
-	}
-
-	/**
-	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,
-	 * is the current one.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void setCurrentViewer(Viewer viewer) {
-		// If it is changing...
-		//
-		if (currentViewer != viewer) {
-			if (selectionChangedListener == null) {
-				// Create the listener on demand.
-				//
-				selectionChangedListener =
-						new ISelectionChangedListener() {
-							// This just notifies those things that are affected by the section.
-							//
-							@Override
-							public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
-								setSelection(selectionChangedEvent.getSelection());
-							}
-						};
-			}
-
-			// Stop listening to the old one.
-			//
-			if (currentViewer != null) {
-				currentViewer.removeSelectionChangedListener(selectionChangedListener);
-			}
-
-			// Start listening to the new one.
-			//
-			if (viewer != null) {
-				viewer.addSelectionChangedListener(selectionChangedListener);
-			}
-
-			// Remember it.
-			//
-			currentViewer = viewer;
-
-			// Set the editors selection based on the current viewer's selection.
-			//
-			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());
-		}
-	}
-
-	/**
-	 * This returns the viewer as required by the {@link IViewerProvider} interface.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Viewer getViewer() {
-		return currentViewer;
-	}
-
-	/**
-	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void createContextMenuFor(StructuredViewer viewer) {
-		MenuManager contextMenu = new MenuManager("#PopUp");
-		contextMenu.add(new Separator("additions"));
-		contextMenu.setRemoveAllWhenShown(true);
-		contextMenu.addMenuListener(this);
-		Menu menu = contextMenu.createContextMenu(viewer.getControl());
-		viewer.getControl().setMenu(menu);
-		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));
-
-		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
-		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance() };
-		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));
-		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));
-	}
-
-	/**
-	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void createModel() {
-		URI resourceURI = EditUIUtil.getURI(getEditorInput());
-		Exception exception = null;
-		Resource resource = null;
-		try {
-			// Load the resource through the editing domain.
-			//
-			resource = editingDomain.getResourceSet().getResource(resourceURI, true);
-		} catch (Exception e) {
-			exception = e;
-			resource = editingDomain.getResourceSet().getResource(resourceURI, false);
-		}
-
-		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);
-		if (diagnostic.getSeverity() != Diagnostic.OK) {
-			resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
-		}
-		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);
-	}
-
-	/**
-	 * Returns a diagnostic describing the errors and warnings listed in the resource
-	 * and the specified exception (if any).
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
-		if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {
-			BasicDiagnostic basicDiagnostic =
-					new BasicDiagnostic
-					(Diagnostic.ERROR,
-							"org.eclipse.papyrus.documentation.plugin.editor",
-							0,
-							getString("_UI_CreateModelError_message", resource.getURI()),
-							new Object[] { exception == null ? (Object) resource : exception });
-			basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));
-			return basicDiagnostic;
-		}
-		else if (exception != null) {
-			return new BasicDiagnostic(Diagnostic.ERROR,
-					"org.eclipse.papyrus.documentation.plugin.editor",
-					0,
-					getString("_UI_CreateModelError_message", resource.getURI()),
-					new Object[] { exception });
-		}
-		else {
-			return Diagnostic.OK_INSTANCE;
-		}
-	}
-
-	/**
-	 * This is the method used by the framework to install your own controls.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void createPages() {
-		// Creates the model from the editor input
-		//
-		createModel();
-
-		// Only creates the other pages if there is something that can be edited
-		//
-		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {
-			// Create a page for the selection tree view.
-			//
-			{
-				ViewerPane viewerPane =
-						new ViewerPane(getSite().getPage(), DocumentationEditor.this) {
-							@Override
-							public Viewer createViewer(Composite composite) {
-								Tree tree = new Tree(composite, SWT.MULTI);
-								TreeViewer newTreeViewer = new TreeViewer(tree);
-								return newTreeViewer;
-							}
-
-							@Override
-							public void requestActivation() {
-								super.requestActivation();
-								setCurrentViewerPane(this);
-							}
-						};
-				viewerPane.createControl(getContainer());
-
-				selectionViewer = (TreeViewer) viewerPane.getViewer();
-				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
-
-				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
-				selectionViewer.setInput(editingDomain.getResourceSet());
-				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
-				viewerPane.setTitle(editingDomain.getResourceSet());
-
-				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);
-
-				createContextMenuFor(selectionViewer);
-				int pageIndex = addPage(viewerPane.getControl());
-				setPageText(pageIndex, getString("_UI_SelectionPage_label"));
-			}
-
-			// Create a page for the parent tree view.
-			//
-			{
-				ViewerPane viewerPane =
-						new ViewerPane(getSite().getPage(), DocumentationEditor.this) {
-							@Override
-							public Viewer createViewer(Composite composite) {
-								Tree tree = new Tree(composite, SWT.MULTI);
-								TreeViewer newTreeViewer = new TreeViewer(tree);
-								return newTreeViewer;
-							}
-
-							@Override
-							public void requestActivation() {
-								super.requestActivation();
-								setCurrentViewerPane(this);
-							}
-						};
-				viewerPane.createControl(getContainer());
-
-				parentViewer = (TreeViewer) viewerPane.getViewer();
-				parentViewer.setAutoExpandLevel(30);
-				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));
-				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
-
-				createContextMenuFor(parentViewer);
-				int pageIndex = addPage(viewerPane.getControl());
-				setPageText(pageIndex, getString("_UI_ParentPage_label"));
-			}
-
-			// This is the page for the list viewer
-			//
-			{
-				ViewerPane viewerPane =
-						new ViewerPane(getSite().getPage(), DocumentationEditor.this) {
-							@Override
-							public Viewer createViewer(Composite composite) {
-								return new ListViewer(composite);
-							}
-
-							@Override
-							public void requestActivation() {
-								super.requestActivation();
-								setCurrentViewerPane(this);
-							}
-						};
-				viewerPane.createControl(getContainer());
-				listViewer = (ListViewer) viewerPane.getViewer();
-				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
-				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
-
-				createContextMenuFor(listViewer);
-				int pageIndex = addPage(viewerPane.getControl());
-				setPageText(pageIndex, getString("_UI_ListPage_label"));
-			}
-
-			// This is the page for the tree viewer
-			//
-			{
-				ViewerPane viewerPane =
-						new ViewerPane(getSite().getPage(), DocumentationEditor.this) {
-							@Override
-							public Viewer createViewer(Composite composite) {
-								return new TreeViewer(composite);
-							}
-
-							@Override
-							public void requestActivation() {
-								super.requestActivation();
-								setCurrentViewerPane(this);
-							}
-						};
-				viewerPane.createControl(getContainer());
-				treeViewer = (TreeViewer) viewerPane.getViewer();
-				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
-				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
-
-				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);
-
-				createContextMenuFor(treeViewer);
-				int pageIndex = addPage(viewerPane.getControl());
-				setPageText(pageIndex, getString("_UI_TreePage_label"));
-			}
-
-			// This is the page for the table viewer.
-			//
-			{
-				ViewerPane viewerPane =
-						new ViewerPane(getSite().getPage(), DocumentationEditor.this) {
-							@Override
-							public Viewer createViewer(Composite composite) {
-								return new TableViewer(composite);
-							}
-
-							@Override
-							public void requestActivation() {
-								super.requestActivation();
-								setCurrentViewerPane(this);
-							}
-						};
-				viewerPane.createControl(getContainer());
-				tableViewer = (TableViewer) viewerPane.getViewer();
-
-				Table table = tableViewer.getTable();
-				TableLayout layout = new TableLayout();
-				table.setLayout(layout);
-				table.setHeaderVisible(true);
-				table.setLinesVisible(true);
-
-				TableColumn objectColumn = new TableColumn(table, SWT.NONE);
-				layout.addColumnData(new ColumnWeightData(3, 100, true));
-				objectColumn.setText(getString("_UI_ObjectColumn_label"));
-				objectColumn.setResizable(true);
-
-				TableColumn selfColumn = new TableColumn(table, SWT.NONE);
-				layout.addColumnData(new ColumnWeightData(2, 100, true));
-				selfColumn.setText(getString("_UI_SelfColumn_label"));
-				selfColumn.setResizable(true);
-
-				tableViewer.setColumnProperties(new String[] { "a", "b" });
-				tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
-				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
-
-				createContextMenuFor(tableViewer);
-				int pageIndex = addPage(viewerPane.getControl());
-				setPageText(pageIndex, getString("_UI_TablePage_label"));
-			}
-
-			// This is the page for the table tree viewer.
-			//
-			{
-				ViewerPane viewerPane =
-						new ViewerPane(getSite().getPage(), DocumentationEditor.this) {
-							@Override
-							public Viewer createViewer(Composite composite) {
-								return new TreeViewer(composite);
-							}
-
-							@Override
-							public void requestActivation() {
-								super.requestActivation();
-								setCurrentViewerPane(this);
-							}
-						};
-				viewerPane.createControl(getContainer());
-
-				treeViewerWithColumns = (TreeViewer) viewerPane.getViewer();
-
-				Tree tree = treeViewerWithColumns.getTree();
-				tree.setLayoutData(new FillLayout());
-				tree.setHeaderVisible(true);
-				tree.setLinesVisible(true);
-
-				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);
-				objectColumn.setText(getString("_UI_ObjectColumn_label"));
-				objectColumn.setResizable(true);
-				objectColumn.setWidth(250);
-
-				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);
-				selfColumn.setText(getString("_UI_SelfColumn_label"));
-				selfColumn.setResizable(true);
-				selfColumn.setWidth(200);
-
-				treeViewerWithColumns.setColumnProperties(new String[] { "a", "b" });
-				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
-				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
-
-				createContextMenuFor(treeViewerWithColumns);
-				int pageIndex = addPage(viewerPane.getControl());
-				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label"));
-			}
-
-			getSite().getShell().getDisplay().asyncExec
-					(new Runnable() {
-						@Override
-						public void run() {
-							setActivePage(0);
-						}
-					});
-		}
-
-		// Ensures that this editor will only display the page's tab
-		// area if there are more than one page
-		//
-		getContainer().addControlListener
-				(new ControlAdapter() {
-					boolean guard = false;
-
-					@Override
-					public void controlResized(ControlEvent event) {
-						if (!guard) {
-							guard = true;
-							hideTabs();
-							guard = false;
-						}
-					}
-				});
-
-		getSite().getShell().getDisplay().asyncExec
-				(new Runnable() {
-					@Override
-					public void run() {
-						updateProblemIndication();
-					}
-				});
-	}
-
-	/**
-	 * If there is just one page in the multi-page editor part,
-	 * this hides the single tab at the bottom.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void hideTabs() {
-		if (getPageCount() <= 1) {
-			setPageText(0, "");
-			if (getContainer() instanceof CTabFolder) {
-				((CTabFolder) getContainer()).setTabHeight(1);
-				Point point = getContainer().getSize();
-				getContainer().setSize(point.x, point.y + 6);
-			}
-		}
-	}
-
-	/**
-	 * If there is more than one page in the multi-page editor part,
-	 * this shows the tabs at the bottom.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void showTabs() {
-		if (getPageCount() > 1) {
-			setPageText(0, getString("_UI_SelectionPage_label"));
-			if (getContainer() instanceof CTabFolder) {
-				((CTabFolder) getContainer()).setTabHeight(SWT.DEFAULT);
-				Point point = getContainer().getSize();
-				getContainer().setSize(point.x, point.y - 6);
-			}
-		}
-	}
-
-	/**
-	 * This is used to track the active viewer.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected void pageChange(int pageIndex) {
-		super.pageChange(pageIndex);
-
-		if (contentOutlinePage != null) {
-			handleContentOutlineSelection(contentOutlinePage.getSelection());
-		}
-	}
-
-	/**
-	 * This is how the framework determines which interfaces we implement.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@SuppressWarnings("rawtypes")
-	@Override
-	public Object getAdapter(Class key) {
-		if (key.equals(IContentOutlinePage.class)) {
-			return showOutlineView() ? getContentOutlinePage() : null;
-		}
-		else if (key.equals(IPropertySheetPage.class)) {
-			return getPropertySheetPage();
-		}
-		else if (key.equals(IGotoMarker.class)) {
-			return this;
-		}
-		else {
-			return super.getAdapter(key);
-		}
-	}
-
-	/**
-	 * This accesses a cached version of the content outliner.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public IContentOutlinePage getContentOutlinePage() {
-		if (contentOutlinePage == null) {
-			// The content outline is just a tree.
-			//
-			class MyContentOutlinePage extends ContentOutlinePage {
-				@Override
-				public void createControl(Composite parent) {
-					super.createControl(parent);
-					contentOutlineViewer = getTreeViewer();
-					contentOutlineViewer.addSelectionChangedListener(this);
-
-					// Set up the tree viewer.
-					//
-					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
-					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
-					contentOutlineViewer.setInput(editingDomain.getResourceSet());
-
-					// Make sure our popups work.
-					//
-					createContextMenuFor(contentOutlineViewer);
-
-					if (!editingDomain.getResourceSet().getResources().isEmpty()) {
-						// Select the root object in the view.
-						//
-						contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
-					}
-				}
-
-				@Override
-				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {
-					super.makeContributions(menuManager, toolBarManager, statusLineManager);
-					contentOutlineStatusLineManager = statusLineManager;
-				}
-
-				@Override
-				public void setActionBars(IActionBars actionBars) {
-					super.setActionBars(actionBars);
-					getActionBarContributor().shareGlobalActions(this, actionBars);
-				}
-			}
-
-			contentOutlinePage = new MyContentOutlinePage();
-
-			// Listen to selection so that we can handle it is a special way.
-			//
-			contentOutlinePage.addSelectionChangedListener
-					(new ISelectionChangedListener() {
-						// This ensures that we handle selections correctly.
-						//
-						@Override
-						public void selectionChanged(SelectionChangedEvent event) {
-							handleContentOutlineSelection(event.getSelection());
-						}
-					});
-		}
-
-		return contentOutlinePage;
-	}
-
-	/**
-	 * This accesses a cached version of the property sheet.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public IPropertySheetPage getPropertySheetPage() {
-		if (propertySheetPage == null) {
-			propertySheetPage =
-					new ExtendedPropertySheetPage(editingDomain) {
-						@Override
-						public void setSelectionToViewer(List<?> selection) {
-							DocumentationEditor.this.setSelectionToViewer(selection);
-							DocumentationEditor.this.setFocus();
-						}
-
-						@Override
-						public void setActionBars(IActionBars actionBars) {
-							super.setActionBars(actionBars);
-							getActionBarContributor().shareGlobalActions(this, actionBars);
-						}
-					};
-			propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));
-		}
-
-		return propertySheetPage;
-	}
-
-	/**
-	 * This deals with how we want selection in the outliner to affect the other views.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void handleContentOutlineSelection(ISelection selection) {
-		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {
-			Iterator<?> selectedElements = ((IStructuredSelection) selection).iterator();
-			if (selectedElements.hasNext()) {
-				// Get the first selected element.
-				//
-				Object selectedElement = selectedElements.next();
-
-				// If it's the selection viewer, then we want it to select the same selection as this selection.
-				//
-				if (currentViewerPane.getViewer() == selectionViewer) {
-					ArrayList<Object> selectionList = new ArrayList<Object>();
-					selectionList.add(selectedElement);
-					while (selectedElements.hasNext()) {
-						selectionList.add(selectedElements.next());
-					}
-
-					// Set the selection to the widget.
-					//
-					selectionViewer.setSelection(new StructuredSelection(selectionList));
-				}
-				else {
-					// Set the input to the widget.
-					//
-					if (currentViewerPane.getViewer().getInput() != selectedElement) {
-						currentViewerPane.getViewer().setInput(selectedElement);
-						currentViewerPane.setTitle(selectedElement);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * This is for implementing {@link IEditorPart} and simply tests the command stack.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public boolean isDirty() {
-		return ((BasicCommandStack) editingDomain.getCommandStack()).isSaveNeeded();
-	}
-
-	/**
-	 * This is for implementing {@link IEditorPart} and simply saves the model file.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void doSave(IProgressMonitor progressMonitor) {
-		// Save only resources that have actually changed.
-		//
-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
-
-		// Do the work within an operation because this is a long running activity that modifies the workbench.
-		//
-		WorkspaceModifyOperation operation =
-				new WorkspaceModifyOperation() {
-					// This is the method that gets invoked when the operation runs.
-					//
-					@Override
-					public void execute(IProgressMonitor monitor) {
-						// Save the resources to the file system.
-						//
-						boolean first = true;
-						for (Resource resource : editingDomain.getResourceSet().getResources()) {
-							if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {
-								try {
-									long timeStamp = resource.getTimeStamp();
-									resource.save(saveOptions);
-									if (resource.getTimeStamp() != timeStamp) {
-										savedResources.add(resource);
-									}
-								}
-								catch (Exception exception) {
-									resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
-								}
-								first = false;
-							}
-						}
-					}
-				};
-
-		updateProblemIndication = false;
-		try {
-			// This runs the options, and shows progress.
-			//
-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
-
-			// Refresh the necessary state.
-			//
-			((BasicCommandStack) editingDomain.getCommandStack()).saveIsDone();
-			firePropertyChange(IEditorPart.PROP_DIRTY);
-		} catch (Exception exception) {
-			// Something went wrong that shouldn't.
-			//
-			PluginDocEditorPlugin.INSTANCE.log(exception);
-		}
-		updateProblemIndication = true;
-		updateProblemIndication();
-	}
-
-	/**
-	 * This returns whether something has been persisted to the URI of the specified resource.
-	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected boolean isPersisted(Resource resource) {
-		boolean result = false;
-		try {
-			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());
-			if (stream != null) {
-				result = true;
-				stream.close();
-			}
-		} catch (IOException e) {
-			// Ignore
-		}
-		return result;
-	}
-
-	/**
-	 * This always returns true because it is not currently supported.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public boolean isSaveAsAllowed() {
-		return true;
-	}
-
-	/**
-	 * This also changes the editor's input.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void doSaveAs() {
-		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());
-		saveAsDialog.open();
-		IPath path = saveAsDialog.getResult();
-		if (path != null) {
-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
-			if (file != null) {
-				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));
-			}
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected void doSaveAs(URI uri, IEditorInput editorInput) {
-		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);
-		setInputWithNotify(editorInput);
-		setPartName(editorInput.getName());
-		IProgressMonitor progressMonitor =
-				getActionBars().getStatusLineManager() != null ?
-						getActionBars().getStatusLineManager().getProgressMonitor() :
-						new NullProgressMonitor();
-		doSave(progressMonitor);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void gotoMarker(IMarker marker) {
-		try {
-			if (marker.getType().equals(EValidator.MARKER)) {
-				String uriAttribute = marker.getAttribute(EValidator.URI_ATTRIBUTE, null);
-				if (uriAttribute != null) {
-					URI uri = URI.createURI(uriAttribute);
-					EObject eObject = editingDomain.getResourceSet().getEObject(uri, true);
-					if (eObject != null) {
-						setSelectionToViewer(Collections.singleton(editingDomain.getWrapper(eObject)));
-					}
-				}
-			}
-		} catch (CoreException exception) {
-			PluginDocEditorPlugin.INSTANCE.log(exception);
-		}
-	}
-
-	/**
-	 * This is called during startup.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void init(IEditorSite site, IEditorInput editorInput) {
-		setSite(site);
-		setInputWithNotify(editorInput);
-		setPartName(editorInput.getName());
-		site.setSelectionProvider(this);
-		site.getPage().addPartListener(partListener);
-		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void setFocus() {
-		if (currentViewerPane != null) {
-			currentViewerPane.setFocus();
-		}
-		else {
-			getControl(getActivePage()).setFocus();
-		}
-	}
-
-	/**
-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void addSelectionChangedListener(ISelectionChangedListener listener) {
-		selectionChangedListeners.add(listener);
-	}
-
-	/**
-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
-		selectionChangedListeners.remove(listener);
-	}
-
-	/**
-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public ISelection getSelection() {
-		return editorSelection;
-	}
-
-	/**
-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.
-	 * Calling this result will notify the listeners.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void setSelection(ISelection selection) {
-		editorSelection = selection;
-
-		for (ISelectionChangedListener listener : selectionChangedListeners) {
-			listener.selectionChanged(new SelectionChangedEvent(this, selection));
-		}
-		setStatusLineManager(selection);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void setStatusLineManager(ISelection selection) {
-		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?
-				contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
-
-		if (statusLineManager != null) {
-			if (selection instanceof IStructuredSelection) {
-				Collection<?> collection = ((IStructuredSelection) selection).toList();
-				switch (collection.size()) {
-				case 0: {
-					statusLineManager.setMessage(getString("_UI_NoObjectSelected"));
-					break;
-				}
-				case 1: {
-					String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());
-					statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text));
-					break;
-				}
-				default: {
-					statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size())));
-					break;
-				}
-				}
-			}
-			else {
-				statusLineManager.setMessage("");
-			}
-		}
-	}
-
-	/**
-	 * This looks up a string in the plugin's plugin.properties file.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private static String getString(String key) {
-		return PluginDocEditorPlugin.INSTANCE.getString(key);
-	}
-
-	/**
-	 * This looks up a string in plugin.properties, making a substitution.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private static String getString(String key, Object s1) {
-		return PluginDocEditorPlugin.INSTANCE.getString(key, new Object[] { s1 });
-	}
-
-	/**
-	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void menuAboutToShow(IMenuManager menuManager) {
-		((IMenuListener) getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EditingDomainActionBarContributor getActionBarContributor() {
-		return (EditingDomainActionBarContributor) getEditorSite().getActionBarContributor();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public IActionBars getActionBars() {
-		return getActionBarContributor().getActionBars();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public AdapterFactory getAdapterFactory() {
-		return adapterFactory;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void dispose() {
-		updateProblemIndication = false;
-
-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);
-
-		getSite().getPage().removePartListener(partListener);
-
-		adapterFactory.dispose();
-
-		if (getActionBarContributor().getActiveEditor() == this) {
-			getActionBarContributor().setActiveEditor(null);
-		}
-
-		if (propertySheetPage != null) {
-			propertySheetPage.dispose();
-		}
-
-		if (contentOutlinePage != null) {
-			contentOutlinePage.dispose();
-		}
-
-		super.dispose();
-	}
-
-	/**
-	 * Returns whether the outline view should be presented to the user.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected boolean showOutlineView() {
-		return true;
-	}
-}
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/presentation/DocumentationModelWizard.java b/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/presentation/DocumentationModelWizard.java
deleted file mode 100644
index 5a98010232f..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/presentation/DocumentationModelWizard.java
+++ /dev/null
@@ -1,634 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.documentation.plugin.documentation.presentation;
-
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.MissingResourceException;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.CommonPlugin;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.papyrus.documentation.plugin.documentation.DocumentationFactory;
-import org.eclipse.papyrus.documentation.plugin.documentation.DocumentationPackage;
-import org.eclipse.papyrus.documentation.plugin.documentation.provider.PluginDocEditPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.part.ISetSelectionTarget;
-
-
-/**
- * This is a simple wizard for creating a new model file.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class DocumentationModelWizard extends Wizard implements INewWizard {
-
-	/**
-	 * The supported extensions for created files.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public static final List<String> FILE_EXTENSIONS = Collections.unmodifiableList(Arrays.asList(PluginDocEditorPlugin.INSTANCE.getString("_UI_DocumentationEditorFilenameExtensions").split("\\s*,\\s*")));
-
-	/**
-	 * A formatted list of supported file extensions, suitable for display.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public static final String FORMATTED_FILE_EXTENSIONS = PluginDocEditorPlugin.INSTANCE.getString("_UI_DocumentationEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", ");
-
-	/**
-	 * This caches an instance of the model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected DocumentationPackage documentationPackage = DocumentationPackage.eINSTANCE;
-
-	/**
-	 * This caches an instance of the model factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected DocumentationFactory documentationFactory = documentationPackage.getDocumentationFactory();
-
-	/**
-	 * This is the file creation page.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected DocumentationModelWizardNewFileCreationPage newFileCreationPage;
-
-	/**
-	 * This is the initial object creation page.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected DocumentationModelWizardInitialObjectCreationPage initialObjectCreationPage;
-
-	/**
-	 * Remember the selection during initialization for populating the default container.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected IStructuredSelection selection;
-
-	/**
-	 * Remember the workbench during initialization.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected IWorkbench workbench;
-
-	/**
-	 * Caches the names of the types that can be created as the root object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected List<String> initialObjectNames;
-
-	/**
-	 * This just records the information.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		this.workbench = workbench;
-		this.selection = selection;
-		setWindowTitle(PluginDocEditorPlugin.INSTANCE.getString("_UI_Wizard_label"));
-		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(PluginDocEditorPlugin.INSTANCE.getImage("full/wizban/NewDocumentation")));
-	}
-
-	/**
-	 * Returns the names of the types that can be created as the root object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected Collection<String> getInitialObjectNames() {
-		if (initialObjectNames == null) {
-			initialObjectNames = new ArrayList<String>();
-			for (EClassifier eClassifier : documentationPackage.getEClassifiers()) {
-				if (eClassifier instanceof EClass) {
-					EClass eClass = (EClass) eClassifier;
-					if (!eClass.isAbstract()) {
-						initialObjectNames.add(eClass.getName());
-					}
-				}
-			}
-			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());
-		}
-		return initialObjectNames;
-	}
-
-	/**
-	 * Create a new model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated NOT
-	 */
-	protected EObject createInitialModel() {
-		return documentationFactory.createDocumentation();
-	}
-
-	/**
-	 * Do the work after everything is specified.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public boolean performFinish() {
-		try {
-			// Remember the file.
-			//
-			final IFile modelFile = getModelFile();
-
-			// Do the work within an operation.
-			//
-			WorkspaceModifyOperation operation = new WorkspaceModifyOperation() {
-
-				@Override
-				protected void execute(IProgressMonitor progressMonitor) {
-					try {
-						// Create a resource set
-						//
-						ResourceSet resourceSet = new ResourceSetImpl();
-
-						// Get the URI of the model file.
-						//
-						URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);
-
-						// Create a resource for this file.
-						//
-						Resource resource = resourceSet.createResource(fileURI);
-
-						// Add the initial model object to the contents.
-						//
-						EObject rootObject = createInitialModel();
-						if (rootObject != null) {
-							resource.getContents().add(rootObject);
-						}
-
-						// Save the contents of the resource to the file system.
-						//
-						Map<Object, Object> options = new HashMap<Object, Object>();
-						options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());
-						resource.save(options);
-					} catch (Exception exception) {
-						PluginDocEditorPlugin.INSTANCE.log(exception);
-					} finally {
-						progressMonitor.done();
-					}
-				}
-			};
-
-			getContainer().run(false, false, operation);
-
-			// Select the new file resource in the current view.
-			//
-			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
-			IWorkbenchPage page = workbenchWindow.getActivePage();
-			final IWorkbenchPart activePart = page.getActivePart();
-			if (activePart instanceof ISetSelectionTarget) {
-				final ISelection targetSelection = new StructuredSelection(modelFile);
-				getShell().getDisplay().asyncExec(new Runnable() {
-
-					@Override
-					public void run() {
-						((ISetSelectionTarget) activePart).selectReveal(targetSelection);
-					}
-				});
-			}
-
-			// Open an editor on the new file.
-			//
-			try {
-				page.openEditor(new FileEditorInput(modelFile), workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());
-			} catch (PartInitException exception) {
-				MessageDialog.openError(workbenchWindow.getShell(), PluginDocEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());
-				return false;
-			}
-
-			return true;
-		} catch (Exception exception) {
-			PluginDocEditorPlugin.INSTANCE.log(exception);
-			return false;
-		}
-	}
-
-	/**
-	 * This is the one page of the wizard.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public class DocumentationModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
-
-		/**
-		 * Pass in the selection.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		public DocumentationModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
-			super(pageId, selection);
-		}
-
-		/**
-		 * The framework calls this to see if the file is correct.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		@Override
-		protected boolean validatePage() {
-			if (super.validatePage()) {
-				String extension = new Path(getFileName()).getFileExtension();
-				if (extension == null || !FILE_EXTENSIONS.contains(extension)) {
-					String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension";
-					setErrorMessage(PluginDocEditorPlugin.INSTANCE.getString(key, new Object[] { FORMATTED_FILE_EXTENSIONS }));
-					return false;
-				}
-				return true;
-			}
-			return false;
-		}
-
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		public IFile getModelFile() {
-			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));
-		}
-	}
-
-	/**
-	 * This is the page where the type of object to create is selected.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public class DocumentationModelWizardInitialObjectCreationPage extends WizardPage {
-
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		protected Combo initialObjectField;
-
-		/**
-		 * @generated
-		 *            <!-- begin-user-doc -->
-		 *            <!-- end-user-doc -->
-		 */
-		protected List<String> encodings;
-
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		protected Combo encodingField;
-
-		/**
-		 * Pass in the selection.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		public DocumentationModelWizardInitialObjectCreationPage(String pageId) {
-			super(pageId);
-		}
-
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		@Override
-		public void createControl(Composite parent) {
-			Composite composite = new Composite(parent, SWT.NONE);
-			{
-				GridLayout layout = new GridLayout();
-				layout.numColumns = 1;
-				layout.verticalSpacing = 12;
-				composite.setLayout(layout);
-
-				GridData data = new GridData();
-				data.verticalAlignment = GridData.FILL;
-				data.grabExcessVerticalSpace = true;
-				data.horizontalAlignment = GridData.FILL;
-				composite.setLayoutData(data);
-			}
-
-			Label containerLabel = new Label(composite, SWT.LEFT);
-			{
-				containerLabel.setText(PluginDocEditorPlugin.INSTANCE.getString("_UI_ModelObject"));
-
-				GridData data = new GridData();
-				data.horizontalAlignment = GridData.FILL;
-				containerLabel.setLayoutData(data);
-			}
-
-			initialObjectField = new Combo(composite, SWT.BORDER);
-			{
-				GridData data = new GridData();
-				data.horizontalAlignment = GridData.FILL;
-				data.grabExcessHorizontalSpace = true;
-				initialObjectField.setLayoutData(data);
-			}
-
-			for (String objectName : getInitialObjectNames()) {
-				initialObjectField.add(getLabel(objectName));
-			}
-
-			if (initialObjectField.getItemCount() == 1) {
-				initialObjectField.select(0);
-			}
-			initialObjectField.addModifyListener(validator);
-
-			Label encodingLabel = new Label(composite, SWT.LEFT);
-			{
-				encodingLabel.setText(PluginDocEditorPlugin.INSTANCE.getString("_UI_XMLEncoding"));
-
-				GridData data = new GridData();
-				data.horizontalAlignment = GridData.FILL;
-				encodingLabel.setLayoutData(data);
-			}
-			encodingField = new Combo(composite, SWT.BORDER);
-			{
-				GridData data = new GridData();
-				data.horizontalAlignment = GridData.FILL;
-				data.grabExcessHorizontalSpace = true;
-				encodingField.setLayoutData(data);
-			}
-
-			for (String encoding : getEncodings()) {
-				encodingField.add(encoding);
-			}
-
-			encodingField.select(0);
-			encodingField.addModifyListener(validator);
-
-			setPageComplete(validatePage());
-			setControl(composite);
-		}
-
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		protected ModifyListener validator = new ModifyListener() {
-
-			@Override
-			public void modifyText(ModifyEvent e) {
-				setPageComplete(validatePage());
-			}
-		};
-
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		protected boolean validatePage() {
-			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());
-		}
-
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		@Override
-		public void setVisible(boolean visible) {
-			super.setVisible(visible);
-			if (visible) {
-				if (initialObjectField.getItemCount() == 1) {
-					initialObjectField.clearSelection();
-					encodingField.setFocus();
-				} else {
-					encodingField.clearSelection();
-					initialObjectField.setFocus();
-				}
-			}
-		}
-
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		public String getInitialObjectName() {
-			String label = initialObjectField.getText();
-
-			for (String name : getInitialObjectNames()) {
-				if (getLabel(name).equals(label)) {
-					return name;
-				}
-			}
-			return null;
-		}
-
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated NOT
-		 */
-		public String getEncoding() {
-			return getEncodings().iterator().next();
-		}
-
-		/**
-		 * Returns the label for the specified type name.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		protected String getLabel(String typeName) {
-			try {
-				return PluginDocEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type");
-			} catch (MissingResourceException mre) {
-				PluginDocEditorPlugin.INSTANCE.log(mre);
-			}
-			return typeName;
-		}
-
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		protected Collection<String> getEncodings() {
-			if (encodings == null) {
-				encodings = new ArrayList<String>();
-				for (StringTokenizer stringTokenizer = new StringTokenizer(PluginDocEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens();) {
-					encodings.add(stringTokenizer.nextToken());
-				}
-			}
-			return encodings;
-		}
-	}
-
-	/**
-	 * The framework calls this to create the contents of the wizard.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated NOT
-	 */
-	@Override
-	public void addPages() {
-		// Create a page, set the title, and the initial model file name.
-		//
-		newFileCreationPage = new DocumentationModelWizardNewFileCreationPage("Whatever", selection);
-		newFileCreationPage.setTitle(PluginDocEditorPlugin.INSTANCE.getString("_UI_DocumentationModelWizard_label"));
-		newFileCreationPage.setDescription(PluginDocEditorPlugin.INSTANCE.getString("_UI_DocumentationModelWizard_description"));
-		newFileCreationPage.setFileName(PluginDocEditorPlugin.INSTANCE.getString("_UI_DocumentationEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0));
-		addPage(newFileCreationPage);
-
-		// Try and get the resource selection to determine a current directory for the file dialog.
-		//
-		if (selection != null && !selection.isEmpty()) {
-			// Get the resource...
-			//
-			Object selectedElement = selection.iterator().next();
-			if (selectedElement instanceof IResource) {
-				// Get the resource parent, if its a file.
-				//
-				IResource selectedResource = (IResource) selectedElement;
-				if (selectedResource.getType() == IResource.FILE) {
-					selectedResource = selectedResource.getParent();
-				}
-
-				// This gives us a directory...
-				//
-				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {
-					// Set this for the container.
-					//
-					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());
-
-					// Make up a unique new name here.
-					//
-					String defaultModelBaseFilename = PluginDocEditorPlugin.INSTANCE.getString("_UI_DocumentationEditorFilenameDefaultBase");
-					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);
-					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension;
-					for (int i = 1; ((IContainer) selectedResource).findMember(modelFilename) != null; ++i) {
-						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension;
-					}
-					newFileCreationPage.setFileName(modelFilename);
-				}
-			}
-		}
-		initialObjectCreationPage = new DocumentationModelWizardInitialObjectCreationPage("Whatever2");
-		// initialObjectCreationPage.setTitle(PluginDocEditorPlugin.INSTANCE.getString("_UI_DocumentationModelWizard_label"));
-		// initialObjectCreationPage.setDescription(PluginDocEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description"));
-		// addPage(initialObjectCreationPage);
-	}
-
-	/**
-	 * Get the file from the page.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public IFile getModelFile() {
-		return newFileCreationPage.getModelFile();
-	}
-
-}
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/presentation/PluginDocEditorPlugin.java b/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/presentation/PluginDocEditorPlugin.java
deleted file mode 100644
index ee5e333fb84..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin.editor/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/presentation/PluginDocEditorPlugin.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.documentation.plugin.documentation.presentation;
-
-import org.eclipse.emf.common.EMFPlugin;
-import org.eclipse.emf.common.ui.EclipseUIPlugin;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
-
-/**
- * This is the central singleton for the PluginDoc editor plugin.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public final class PluginDocEditorPlugin extends EMFPlugin {
-	/**
-	 * Keep track of the singleton.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public static final PluginDocEditorPlugin INSTANCE = new PluginDocEditorPlugin();
-
-	/**
-	 * Keep track of the singleton.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private static Implementation plugin;
-
-	/**
-	 * Create the instance.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public PluginDocEditorPlugin() {
-		super(new ResourceLocator[] {
-				EcoreEditPlugin.INSTANCE,
-		});
-	}
-
-	/**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the singleton instance.
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getPluginResourceLocator() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the singleton instance.
-	 * @generated
-	 */
-	public static Implementation getPlugin() {
-		return plugin;
-	}
-
-	/**
-	 * The actual implementation of the Eclipse <b>Plugin</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public static class Implementation extends EclipseUIPlugin {
-		/**
-		 * Creates an instance.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		public Implementation() {
-			super();
-
-			// Remember the static instance.
-			//
-			plugin = this;
-		}
-	}
-
-}
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin/.classpath b/plugins/developer/org.eclipse.papyrus.documentation.plugin/.classpath
deleted file mode 100644
index 9c0318f0fd2..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src-gen"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin/.project b/plugins/developer/org.eclipse.papyrus.documentation.plugin/.project
deleted file mode 100644
index f3a93f355b8..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.documentation.plugin</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin/.settings/org.eclipse.jdt.core.prefs b/plugins/developer/org.eclipse.papyrus.documentation.plugin/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 4759947300a..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,291 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=260
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=false
-org.eclipse.jdt.core.formatter.join_wrapped_lines=false
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=260
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=5
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=false
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin/.settings/org.eclipse.jdt.ui.prefs b/plugins/developer/org.eclipse.papyrus.documentation.plugin/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 954281dbc31..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,68 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_Papyrus
-cleanup_settings_version=2
-eclipse.preferences.version=1
-formatter_profile=_Papyrus
-formatter_settings_version=12
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*****************************************************************************\n * Copyright (c) ${year} CEA LIST and others.\n * \n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *   CEA LIST - Initial API and implementation\n *   \n *****************************************************************************/\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.documentation.plugin/META-INF/MANIFEST.MF
deleted file mode 100644
index 0b5837d656a..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore,
- org.eclipse.ui;bundle-version="3.7.0"
-Export-Package: org.eclipse.papyrus.documentation.plugin.documentation,
- org.eclipse.papyrus.documentation.plugin.documentation.impl,
- org.eclipse.papyrus.documentation.plugin.documentation.util
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.1.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.documentation.plugin;singleto
- n:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin/Model/PluginDoc.ecore b/plugins/developer/org.eclipse.papyrus.documentation.plugin/Model/PluginDoc.ecore
deleted file mode 100644
index 746eddd48cc..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin/Model/PluginDoc.ecore
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="documentation"
-    nsURI="http://www.eclipse.org/papyrus/documentation/plugin/documentation" nsPrefix="doc">
-  <eClassifiers xsi:type="ecore:EClass" name="Documentation" eSuperTypes="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EModelElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The root for a plug-in documentation&#xD;&#xA;&#xD;&#xA;Contains a description of the plug-in"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="implicitDependencies" upperBound="-1"
-        eType="#//Dependency" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="referent" upperBound="-1"
-        eType="#//Person" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="additionalComments" upperBound="-1"
-        eType="#//Comment" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Dependency" eSuperTypes="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EModelElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Describes a non-Java dependency, i.e. a dependency which cannot be automatically handled by the Eclipse tooling.&#xD;&#xA;&#xD;&#xA;This is typically a resource dependency (Model, Icon, ...).&#xD;&#xA;&#xD;&#xA;The dependency refers to a plug-in (which should always be present in the plug-in dependencies), and has a comment to explain why this dependency is required."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="plugin" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="comment" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="FileDependency" eSuperTypes="#//Dependency">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Specify a dependency when a plug-in needs a non-java file in another plug-in.&#xD;&#xA;&#xD;&#xA;For example, this dependency can be used when a plug-in needs to have an access to a model in another plug-in.&#xD;&#xA;&#xD;&#xA;The file can be either a file or a folder"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="file" lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Person" eSuperTypes="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EModelElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Represents a person"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="firstName" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="lastName" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="eMail" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="currentCompany" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Comment" eSuperTypes="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EModelElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="An additional comment about the plug-in"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="title" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="contents" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin/Model/PluginDoc.genmodel b/plugins/developer/org.eclipse.papyrus.documentation.plugin/Model/PluginDoc.genmodel
deleted file mode 100644
index 36c190202ac..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin/Model/PluginDoc.genmodel
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.papyrus.documentation.plugin/src-gen"
-    editDirectory="/org.eclipse.papyrus.documentation.plugin.edit/src-gen" editorDirectory="/org.eclipse.papyrus.documentation.plugin.editor/src-gen"
-    modelPluginID="org.eclipse.papyrus.documentation.plugin" modelName="PluginDoc"
-    testsDirectory="/org.eclipse.papyrus.documentation.plugin.tests/src-gen" importerID="org.eclipse.emf.importer.ecore"
-    complianceLevel="5.0" copyrightFields="false" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
-  <foreignModel>PluginDoc.ecore</foreignModel>
-  <genPackages prefix="Documentation" basePackage="org.eclipse.papyrus.documentation.plugin"
-      disposableProviderFactory="true" fileExtensions="pdoc" ecorePackage="PluginDoc.ecore#/">
-    <genClasses ecoreClass="PluginDoc.ecore#//Documentation">
-      <genFeatures createChild="false" propertyMultiLine="true" ecoreFeature="ecore:EAttribute PluginDoc.ecore#//Documentation/description"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference PluginDoc.ecore#//Documentation/implicitDependencies"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference PluginDoc.ecore#//Documentation/referent"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference PluginDoc.ecore#//Documentation/additionalComments"/>
-    </genClasses>
-    <genClasses ecoreClass="PluginDoc.ecore#//Dependency">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute PluginDoc.ecore#//Dependency/plugin"/>
-      <genFeatures createChild="false" propertyMultiLine="true" ecoreFeature="ecore:EAttribute PluginDoc.ecore#//Dependency/comment"/>
-    </genClasses>
-    <genClasses ecoreClass="PluginDoc.ecore#//FileDependency">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute PluginDoc.ecore#//FileDependency/file"/>
-    </genClasses>
-    <genClasses ecoreClass="PluginDoc.ecore#//Person">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute PluginDoc.ecore#//Person/firstName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute PluginDoc.ecore#//Person/lastName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute PluginDoc.ecore#//Person/eMail"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute PluginDoc.ecore#//Person/currentCompany"/>
-    </genClasses>
-    <genClasses ecoreClass="PluginDoc.ecore#//Comment">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute PluginDoc.ecore#//Comment/title"/>
-      <genFeatures createChild="false" propertyMultiLine="true" ecoreFeature="ecore:EAttribute PluginDoc.ecore#//Comment/contents"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin/about.html b/plugins/developer/org.eclipse.papyrus.documentation.plugin/about.html
deleted file mode 100644
index 82d49bf5f81..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2007</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin/build.properties b/plugins/developer/org.eclipse.papyrus.documentation.plugin/build.properties
deleted file mode 100644
index e0c9e25ce9e..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-
-# <copyright>
-# </copyright>
-#
-# $Id$
-
-bin.includes = .,\
-               Model/,\
-               META-INF/,\
-               plugin.xml,\
-               plugin.properties,\
-               about.html
-jars.compile.order = .
-source.. = src-gen/,\
-           src/
-output.. = bin/
-src.includes = about.html
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin/plugin-doc.pdoc b/plugins/developer/org.eclipse.papyrus.documentation.plugin/plugin-doc.pdoc
deleted file mode 100644
index 802aeb164d9..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin/plugin-doc.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" xsi:schemaLocation="http://www.eclipse.org/papyrus/documentation/plugin/documentation Model/PluginDoc.ecore" description="A model for adding a local documentation and metadata to a plug-in.">
-  <referent firstName="Camille" lastName="Letavernier" eMail="camille.letavernier@wanadoo.fr" currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin/plugin.properties b/plugins/developer/org.eclipse.papyrus.documentation.plugin/plugin.properties
deleted file mode 100644
index ff580237a89..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin/plugin.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-
-# <copyright>
-# </copyright>
-#
-# $Id$
-
-pluginName = PluginDoc Model
-providerName = Eclipse Modeling Project
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin/plugin.xml b/plugins/developer/org.eclipse.papyrus.documentation.plugin/plugin.xml
deleted file mode 100644
index 86d60423330..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin/plugin.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!--
- <copyright>
- </copyright>
-
- $Id$
--->
-
-<plugin>
-
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <package
-            uri="http://www.eclipse.org/papyrus/documentation/plugin/documentation"
-            class="org.eclipse.papyrus.documentation.plugin.documentation.DocumentationPackage"
-            genModel="Model/PluginDoc.genmodel"/>
-   </extension>
-
-</plugin>
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin/pom.xml b/plugins/developer/org.eclipse.papyrus.documentation.plugin/pom.xml
deleted file mode 100644
index 7fff385e63f..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>org.eclipse.papyrus</artifactId>
-		<groupId>org.eclipse.papyrus</groupId>
-		<version>1.1.0-SNAPSHOT</version>
-		<relativePath>../../../releng/top-pom-dev.xml</relativePath>
-	</parent>
-	<artifactId>org.eclipse.papyrus.documentation.plugin</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.1.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
-\ No newline at end of file
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/Comment.java b/plugins/developer/org.eclipse.papyrus.documentation.plugin/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/Comment.java
deleted file mode 100644
index cfc167267d3..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/Comment.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.documentation.plugin.documentation;
-
-import org.eclipse.emf.ecore.EModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Comment</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * An additional comment about the plug-in
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.papyrus.documentation.plugin.documentation.Comment#getTitle <em>Title</em>}</li>
- * <li>{@link org.eclipse.papyrus.documentation.plugin.documentation.Comment#getContents <em>Contents</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.documentation.plugin.documentation.DocumentationPackage#getComment()
- * @model
- * @generated
- */
-public interface Comment extends EModelElement {
-	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the value of the '<em>Title</em>' attribute.
-	 * @see #setTitle(String)
-	 * @see org.eclipse.papyrus.documentation.plugin.documentation.DocumentationPackage#getComment_Title()
-	 * @model required="true"
-	 * @generated
-	 */
-	String getTitle();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.documentation.plugin.documentation.Comment#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Title</em>' attribute.
-	 * @see #getTitle()
-	 * @generated
-	 */
-	void setTitle(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Contents</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Contents</em>' attribute isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the value of the '<em>Contents</em>' attribute.
-	 * @see #setContents(String)
-	 * @see org.eclipse.papyrus.documentation.plugin.documentation.DocumentationPackage#getComment_Contents()
-	 * @model required="true"
-	 * @generated
-	 */
-	String getContents();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.documentation.plugin.documentation.Comment#getContents <em>Contents</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Contents</em>' attribute.
-	 * @see #getContents()
-	 * @generated
-	 */
-	void setContents(String value);
-
-} // Comment
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/Dependency.java b/plugins/developer/org.eclipse.papyrus.documentation.plugin/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/Dependency.java
deleted file mode 100644
index 08aee817cca..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/Dependency.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.documentation.plugin.documentation;
-
-import org.eclipse.emf.ecore.EModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Dependency</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Describes a non-Java dependency, i.e. a dependency which cannot be automatically handled by the Eclipse tooling.
- *
- * This is typically a resource dependency (Model, Icon, ...).
- *
- * The dependency refers to a plug-in (which should always be present in the plug-in dependencies), and has a comment to explain why this dependency is required.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.papyrus.documentation.plugin.documentation.Dependency#getPlugin <em>Plugin</em>}</li>
- * <li>{@link org.eclipse.papyrus.documentation.plugin.documentation.Dependency#getComment <em>Comment</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.documentation.plugin.documentation.DocumentationPackage#getDependency()
- * @model
- * @generated
- */
-public interface Dependency extends EModelElement {
-	/**
-	 * Returns the value of the '<em><b>Plugin</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Plugin</em>' attribute isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the value of the '<em>Plugin</em>' attribute.
-	 * @see #setPlugin(String)
-	 * @see org.eclipse.papyrus.documentation.plugin.documentation.DocumentationPackage#getDependency_Plugin()
-	 * @model required="true"
-	 * @generated
-	 */
-	String getPlugin();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.documentation.plugin.documentation.Dependency#getPlugin <em>Plugin</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Plugin</em>' attribute.
-	 * @see #getPlugin()
-	 * @generated
-	 */
-	void setPlugin(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Comment</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Comment</em>' attribute isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the value of the '<em>Comment</em>' attribute.
-	 * @see #setComment(String)
-	 * @see org.eclipse.papyrus.documentation.plugin.documentation.DocumentationPackage#getDependency_Comment()
-	 * @model required="true"
-	 * @generated
-	 */
-	String getComment();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.documentation.plugin.documentation.Dependency#getComment <em>Comment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Comment</em>' attribute.
-	 * @see #getComment()
-	 * @generated
-	 */
-	void setComment(String value);
-
-} // Dependency
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/Documentation.java b/plugins/developer/org.eclipse.papyrus.documentation.plugin/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/Documentation.java
deleted file mode 100644
index e413a06921e..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/Documentation.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.documentation.plugin.documentation;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Documentation</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * The root for a plug-in documentation
- *
- * Contains a description of the plug-in
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.papyrus.documentation.plugin.documentation.Documentation#getDescription <em>Description</em>}</li>
- * <li>{@link org.eclipse.papyrus.documentation.plugin.documentation.Documentation#getImplicitDependencies <em>Implicit Dependencies</em>}</li>
- * <li>{@link org.eclipse.papyrus.documentation.plugin.documentation.Documentation#getReferent <em>Referent</em>}</li>
- * <li>{@link org.eclipse.papyrus.documentation.plugin.documentation.Documentation#getAdditionalComments <em>Additional Comments</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.documentation.plugin.documentation.DocumentationPackage#getDocumentation()
- * @model
- * @generated
- */
-public interface Documentation extends EModelElement {
-	/**
-	 * Returns the value of the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Description</em>' attribute isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the value of the '<em>Description</em>' attribute.
-	 * @see #setDescription(String)
-	 * @see org.eclipse.papyrus.documentation.plugin.documentation.DocumentationPackage#getDocumentation_Description()
-	 * @model required="true"
-	 * @generated
-	 */
-	String getDescription();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.documentation.plugin.documentation.Documentation#getDescription <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Description</em>' attribute.
-	 * @see #getDescription()
-	 * @generated
-	 */
-	void setDescription(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Implicit Dependencies</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.documentation.plugin.documentation.Dependency}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Implicit Dependencies</em>' containment reference list isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the value of the '<em>Implicit Dependencies</em>' containment reference list.
-	 * @see org.eclipse.papyrus.documentation.plugin.documentation.DocumentationPackage#getDocumentation_ImplicitDependencies()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<Dependency> getImplicitDependencies();
-
-	/**
-	 * Returns the value of the '<em><b>Referent</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.documentation.plugin.documentation.Person}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Referent</em>' containment reference list isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the value of the '<em>Referent</em>' containment reference list.
-	 * @see org.eclipse.papyrus.documentation.plugin.documentation.DocumentationPackage#getDocumentation_Referent()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<Person> getReferent();
-
-	/**
-	 * Returns the value of the '<em><b>Additional Comments</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.documentation.plugin.documentation.Comment}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Additional Comments</em>' containment reference list isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the value of the '<em>Additional Comments</em>' containment reference list.
-	 * @see org.eclipse.papyrus.documentation.plugin.documentation.DocumentationPackage#getDocumentation_AdditionalComments()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<Comment> getAdditionalComments();
-
-} // Documentation
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/DocumentationFactory.java b/plugins/developer/org.eclipse.papyrus.documentation.plugin/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/DocumentationFactory.java
deleted file mode 100644
index e8eda4d5cb0..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/DocumentationFactory.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.documentation.plugin.documentation;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.documentation.plugin.documentation.DocumentationPackage
- * @generated
- */
-public interface DocumentationFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	DocumentationFactory eINSTANCE = org.eclipse.papyrus.documentation.plugin.documentation.impl.DocumentationFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Documentation</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return a new object of class '<em>Documentation</em>'.
-	 * @generated
-	 */
-	Documentation createDocumentation();
-
-	/**
-	 * Returns a new object of class '<em>Dependency</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return a new object of class '<em>Dependency</em>'.
-	 * @generated
-	 */
-	Dependency createDependency();
-
-	/**
-	 * Returns a new object of class '<em>File Dependency</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return a new object of class '<em>File Dependency</em>'.
-	 * @generated
-	 */
-	FileDependency createFileDependency();
-
-	/**
-	 * Returns a new object of class '<em>Person</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return a new object of class '<em>Person</em>'.
-	 * @generated
-	 */
-	Person createPerson();
-
-	/**
-	 * Returns a new object of class '<em>Comment</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return a new object of class '<em>Comment</em>'.
-	 * @generated
-	 */
-	Comment createComment();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	DocumentationPackage getDocumentationPackage();
-
-} // DocumentationFactory
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/DocumentationPackage.java b/plugins/developer/org.eclipse.papyrus.documentation.plugin/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/DocumentationPackage.java
deleted file mode 100644
index c14d1a6f75d..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/DocumentationPackage.java
+++ /dev/null
@@ -1,783 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.documentation.plugin.documentation;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.documentation.plugin.documentation.DocumentationFactory
- * @model kind="package"
- * @generated
- */
-public interface DocumentationPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	String eNAME = "documentation";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	String eNS_URI = "http://www.eclipse.org/papyrus/documentation/plugin/documentation";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	String eNS_PREFIX = "doc";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	DocumentationPackage eINSTANCE = org.eclipse.papyrus.documentation.plugin.documentation.impl.DocumentationPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.documentation.plugin.documentation.impl.DocumentationImpl <em>Documentation</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see org.eclipse.papyrus.documentation.plugin.documentation.impl.DocumentationImpl
-	 * @see org.eclipse.papyrus.documentation.plugin.documentation.impl.DocumentationPackageImpl#getDocumentation()
-	 * @generated
-	 */
-	int DOCUMENTATION = 0;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int DOCUMENTATION__EANNOTATIONS = EcorePackage.EMODEL_ELEMENT__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int DOCUMENTATION__DESCRIPTION = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Implicit Dependencies</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int DOCUMENTATION__IMPLICIT_DEPENDENCIES = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Referent</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int DOCUMENTATION__REFERENT = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Additional Comments</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int DOCUMENTATION__ADDITIONAL_COMMENTS = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Documentation</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int DOCUMENTATION_FEATURE_COUNT = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.documentation.plugin.documentation.impl.DependencyImpl <em>Dependency</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see org.eclipse.papyrus.documentation.plugin.documentation.impl.DependencyImpl
-	 * @see org.eclipse.papyrus.documentation.plugin.documentation.impl.DocumentationPackageImpl#getDependency()
-	 * @generated
-	 */
-	int DEPENDENCY = 1;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int DEPENDENCY__EANNOTATIONS = EcorePackage.EMODEL_ELEMENT__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Plugin</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int DEPENDENCY__PLUGIN = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Comment</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int DEPENDENCY__COMMENT = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Dependency</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int DEPENDENCY_FEATURE_COUNT = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.documentation.plugin.documentation.impl.FileDependencyImpl <em>File Dependency</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see org.eclipse.papyrus.documentation.plugin.documentation.impl.FileDependencyImpl
-	 * @see org.eclipse.papyrus.documentation.plugin.documentation.impl.DocumentationPackageImpl#getFileDependency()
-	 * @generated
-	 */
-	int FILE_DEPENDENCY = 2;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int FILE_DEPENDENCY__EANNOTATIONS = DEPENDENCY__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Plugin</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int FILE_DEPENDENCY__PLUGIN = DEPENDENCY__PLUGIN;
-
-	/**
-	 * The feature id for the '<em><b>Comment</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int FILE_DEPENDENCY__COMMENT = DEPENDENCY__COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>File</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int FILE_DEPENDENCY__FILE = DEPENDENCY_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>File Dependency</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int FILE_DEPENDENCY_FEATURE_COUNT = DEPENDENCY_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.documentation.plugin.documentation.impl.PersonImpl <em>Person</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see org.eclipse.papyrus.documentation.plugin.documentation.impl.PersonImpl
-	 * @see org.eclipse.papyrus.documentation.plugin.documentation.impl.DocumentationPackageImpl#getPerson()
-	 * @generated
-	 */
-	int PERSON = 3;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int PERSON__EANNOTATIONS = EcorePackage.EMODEL_ELEMENT__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>First Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int PERSON__FIRST_NAME = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Last Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int PERSON__LAST_NAME = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>EMail</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int PERSON__EMAIL = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Current Company</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int PERSON__CURRENT_COMPANY = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Person</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int PERSON_FEATURE_COUNT = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.documentation.plugin.documentation.impl.CommentImpl <em>Comment</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see org.eclipse.papyrus.documentation.plugin.documentation.impl.CommentImpl
-	 * @see org.eclipse.papyrus.documentation.plugin.documentation.impl.DocumentationPackageImpl#getComment()
-	 * @generated
-	 */
-	int COMMENT = 4;
-
-	/**
-	 * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int COMMENT__EANNOTATIONS = EcorePackage.EMODEL_ELEMENT__EANNOTATIONS;
-
-	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int COMMENT__TITLE = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Contents</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int COMMENT__CONTENTS = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Comment</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 * @ordered
-	 */
-	int COMMENT_FEATURE_COUNT = EcorePackage.EMODEL_ELEMENT_FEATURE_COUNT + 2;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.documentation.plugin.documentation.Documentation <em>Documentation</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for class '<em>Documentation</em>'.
-	 * @see org.eclipse.papyrus.documentation.plugin.documentation.Documentation
-	 * @generated
-	 */
-	EClass getDocumentation();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.documentation.plugin.documentation.Documentation#getDescription <em>Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the attribute '<em>Description</em>'.
-	 * @see org.eclipse.papyrus.documentation.plugin.documentation.Documentation#getDescription()
-	 * @see #getDocumentation()
-	 * @generated
-	 */
-	EAttribute getDocumentation_Description();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.documentation.plugin.documentation.Documentation#getImplicitDependencies <em>Implicit Dependencies</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the containment reference list '<em>Implicit Dependencies</em>'.
-	 * @see org.eclipse.papyrus.documentation.plugin.documentation.Documentation#getImplicitDependencies()
-	 * @see #getDocumentation()
-	 * @generated
-	 */
-	EReference getDocumentation_ImplicitDependencies();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.documentation.plugin.documentation.Documentation#getReferent <em>Referent</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the containment reference list '<em>Referent</em>'.
-	 * @see org.eclipse.papyrus.documentation.plugin.documentation.Documentation#getReferent()
-	 * @see #getDocumentation()
-	 * @generated
-	 */
-	EReference getDocumentation_Referent();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.documentation.plugin.documentation.Documentation#getAdditionalComments <em>Additional Comments</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the containment reference list '<em>Additional Comments</em>'.
-	 * @see org.eclipse.papyrus.documentation.plugin.documentation.Documentation#getAdditionalComments()
-	 * @see #getDocumentation()
-	 * @generated
-	 */
-	EReference getDocumentation_AdditionalComments();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.documentation.plugin.documentation.Dependency <em>Dependency</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for class '<em>Dependency</em>'.
-	 * @see org.eclipse.papyrus.documentation.plugin.documentation.Dependency
-	 * @generated
-	 */
-	EClass getDependency();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.documentation.plugin.documentation.Dependency#getPlugin <em>Plugin</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the attribute '<em>Plugin</em>'.
-	 * @see org.eclipse.papyrus.documentation.plugin.documentation.Dependency#getPlugin()
-	 * @see #getDependency()
-	 * @generated
-	 */
-	EAttribute getDependency_Plugin();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.documentation.plugin.documentation.Dependency#getComment <em>Comment</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the attribute '<em>Comment</em>'.
-	 * @see org.eclipse.papyrus.documentation.plugin.documentation.Dependency#getComment()
-	 * @see #getDependency()
-	 * @generated
-	 */
-	EAttribute getDependency_Comment();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.documentation.plugin.documentation.FileDependency <em>File Dependency</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for class '<em>File Dependency</em>'.
-	 * @see org.eclipse.papyrus.documentation.plugin.documentation.FileDependency
-	 * @generated
-	 */
-	EClass getFileDependency();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.documentation.plugin.documentation.FileDependency#getFile <em>File</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the attribute '<em>File</em>'.
-	 * @see org.eclipse.papyrus.documentation.plugin.documentation.FileDependency#getFile()
-	 * @see #getFileDependency()
-	 * @generated
-	 */
-	EAttribute getFileDependency_File();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.documentation.plugin.documentation.Person <em>Person</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for class '<em>Person</em>'.
-	 * @see org.eclipse.papyrus.documentation.plugin.documentation.Person
-	 * @generated
-	 */
-	EClass getPerson();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.documentation.plugin.documentation.Person#getFirstName <em>First Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the attribute '<em>First Name</em>'.
-	 * @see org.eclipse.papyrus.documentation.plugin.documentation.Person#getFirstName()
-	 * @see #getPerson()
-	 * @generated
-	 */
-	EAttribute getPerson_FirstName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.documentation.plugin.documentation.Person#getLastName <em>Last Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the attribute '<em>Last Name</em>'.
-	 * @see org.eclipse.papyrus.documentation.plugin.documentation.Person#getLastName()
-	 * @see #getPerson()
-	 * @generated
-	 */
-	EAttribute getPerson_LastName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.documentation.plugin.documentation.Person#getEMail <em>EMail</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the attribute '<em>EMail</em>'.
-	 * @see org.eclipse.papyrus.documentation.plugin.documentation.Person#getEMail()
-	 * @see #getPerson()
-	 * @generated
-	 */
-	EAttribute getPerson_EMail();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.documentation.plugin.documentation.Person#getCurrentCompany <em>Current Company</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the attribute '<em>Current Company</em>'.
-	 * @see org.eclipse.papyrus.documentation.plugin.documentation.Person#getCurrentCompany()
-	 * @see #getPerson()
-	 * @generated
-	 */
-	EAttribute getPerson_CurrentCompany();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.documentation.plugin.documentation.Comment <em>Comment</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for class '<em>Comment</em>'.
-	 * @see org.eclipse.papyrus.documentation.plugin.documentation.Comment
-	 * @generated
-	 */
-	EClass getComment();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.documentation.plugin.documentation.Comment#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the attribute '<em>Title</em>'.
-	 * @see org.eclipse.papyrus.documentation.plugin.documentation.Comment#getTitle()
-	 * @see #getComment()
-	 * @generated
-	 */
-	EAttribute getComment_Title();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.documentation.plugin.documentation.Comment#getContents <em>Contents</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the attribute '<em>Contents</em>'.
-	 * @see org.eclipse.papyrus.documentation.plugin.documentation.Comment#getContents()
-	 * @see #getComment()
-	 * @generated
-	 */
-	EAttribute getComment_Contents();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	DocumentationFactory getDocumentationFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 * <li>each class,</li>
-	 * <li>each feature of each class,</li>
-	 * <li>each enum,</li>
-	 * <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.documentation.plugin.documentation.impl.DocumentationImpl <em>Documentation</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @see org.eclipse.papyrus.documentation.plugin.documentation.impl.DocumentationImpl
-		 * @see org.eclipse.papyrus.documentation.plugin.documentation.impl.DocumentationPackageImpl#getDocumentation()
-		 * @generated
-		 */
-		EClass DOCUMENTATION = eINSTANCE.getDocumentation();
-
-		/**
-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		EAttribute DOCUMENTATION__DESCRIPTION = eINSTANCE.getDocumentation_Description();
-
-		/**
-		 * The meta object literal for the '<em><b>Implicit Dependencies</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		EReference DOCUMENTATION__IMPLICIT_DEPENDENCIES = eINSTANCE.getDocumentation_ImplicitDependencies();
-
-		/**
-		 * The meta object literal for the '<em><b>Referent</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		EReference DOCUMENTATION__REFERENT = eINSTANCE.getDocumentation_Referent();
-
-		/**
-		 * The meta object literal for the '<em><b>Additional Comments</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		EReference DOCUMENTATION__ADDITIONAL_COMMENTS = eINSTANCE.getDocumentation_AdditionalComments();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.documentation.plugin.documentation.impl.DependencyImpl <em>Dependency</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @see org.eclipse.papyrus.documentation.plugin.documentation.impl.DependencyImpl
-		 * @see org.eclipse.papyrus.documentation.plugin.documentation.impl.DocumentationPackageImpl#getDependency()
-		 * @generated
-		 */
-		EClass DEPENDENCY = eINSTANCE.getDependency();
-
-		/**
-		 * The meta object literal for the '<em><b>Plugin</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		EAttribute DEPENDENCY__PLUGIN = eINSTANCE.getDependency_Plugin();
-
-		/**
-		 * The meta object literal for the '<em><b>Comment</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		EAttribute DEPENDENCY__COMMENT = eINSTANCE.getDependency_Comment();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.documentation.plugin.documentation.impl.FileDependencyImpl <em>File Dependency</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @see org.eclipse.papyrus.documentation.plugin.documentation.impl.FileDependencyImpl
-		 * @see org.eclipse.papyrus.documentation.plugin.documentation.impl.DocumentationPackageImpl#getFileDependency()
-		 * @generated
-		 */
-		EClass FILE_DEPENDENCY = eINSTANCE.getFileDependency();
-
-		/**
-		 * The meta object literal for the '<em><b>File</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		EAttribute FILE_DEPENDENCY__FILE = eINSTANCE.getFileDependency_File();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.documentation.plugin.documentation.impl.PersonImpl <em>Person</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @see org.eclipse.papyrus.documentation.plugin.documentation.impl.PersonImpl
-		 * @see org.eclipse.papyrus.documentation.plugin.documentation.impl.DocumentationPackageImpl#getPerson()
-		 * @generated
-		 */
-		EClass PERSON = eINSTANCE.getPerson();
-
-		/**
-		 * The meta object literal for the '<em><b>First Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		EAttribute PERSON__FIRST_NAME = eINSTANCE.getPerson_FirstName();
-
-		/**
-		 * The meta object literal for the '<em><b>Last Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		EAttribute PERSON__LAST_NAME = eINSTANCE.getPerson_LastName();
-
-		/**
-		 * The meta object literal for the '<em><b>EMail</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		EAttribute PERSON__EMAIL = eINSTANCE.getPerson_EMail();
-
-		/**
-		 * The meta object literal for the '<em><b>Current Company</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		EAttribute PERSON__CURRENT_COMPANY = eINSTANCE.getPerson_CurrentCompany();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.documentation.plugin.documentation.impl.CommentImpl <em>Comment</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @see org.eclipse.papyrus.documentation.plugin.documentation.impl.CommentImpl
-		 * @see org.eclipse.papyrus.documentation.plugin.documentation.impl.DocumentationPackageImpl#getComment()
-		 * @generated
-		 */
-		EClass COMMENT = eINSTANCE.getComment();
-
-		/**
-		 * The meta object literal for the '<em><b>Title</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		EAttribute COMMENT__TITLE = eINSTANCE.getComment_Title();
-
-		/**
-		 * The meta object literal for the '<em><b>Contents</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 *
-		 * @generated
-		 */
-		EAttribute COMMENT__CONTENTS = eINSTANCE.getComment_Contents();
-
-	}
-
-} // DocumentationPackage
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/FileDependency.java b/plugins/developer/org.eclipse.papyrus.documentation.plugin/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/FileDependency.java
deleted file mode 100644
index 5235665aa9b..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/FileDependency.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.documentation.plugin.documentation;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>File Dependency</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Specify a dependency when a plug-in needs a non-java file in another plug-in.
- *
- * For example, this dependency can be used when a plug-in needs to have an access to a model in another plug-in.
- *
- * The file can be either a file or a folder
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.papyrus.documentation.plugin.documentation.FileDependency#getFile <em>File</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.documentation.plugin.documentation.DocumentationPackage#getFileDependency()
- * @model
- * @generated
- */
-public interface FileDependency extends Dependency {
-	/**
-	 * Returns the value of the '<em><b>File</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>File</em>' attribute isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the value of the '<em>File</em>' attribute.
-	 * @see #setFile(String)
-	 * @see org.eclipse.papyrus.documentation.plugin.documentation.DocumentationPackage#getFileDependency_File()
-	 * @model required="true"
-	 * @generated
-	 */
-	String getFile();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.documentation.plugin.documentation.FileDependency#getFile <em>File</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>File</em>' attribute.
-	 * @see #getFile()
-	 * @generated
-	 */
-	void setFile(String value);
-
-} // FileDependency
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/Person.java b/plugins/developer/org.eclipse.papyrus.documentation.plugin/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/Person.java
deleted file mode 100644
index 0e97775e8d1..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/Person.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.documentation.plugin.documentation;
-
-import org.eclipse.emf.ecore.EModelElement;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Person</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Represents a person
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.papyrus.documentation.plugin.documentation.Person#getFirstName <em>First Name</em>}</li>
- * <li>{@link org.eclipse.papyrus.documentation.plugin.documentation.Person#getLastName <em>Last Name</em>}</li>
- * <li>{@link org.eclipse.papyrus.documentation.plugin.documentation.Person#getEMail <em>EMail</em>}</li>
- * <li>{@link org.eclipse.papyrus.documentation.plugin.documentation.Person#getCurrentCompany <em>Current Company</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.documentation.plugin.documentation.DocumentationPackage#getPerson()
- * @model
- * @generated
- */
-public interface Person extends EModelElement {
-	/**
-	 * Returns the value of the '<em><b>First Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>First Name</em>' attribute isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the value of the '<em>First Name</em>' attribute.
-	 * @see #setFirstName(String)
-	 * @see org.eclipse.papyrus.documentation.plugin.documentation.DocumentationPackage#getPerson_FirstName()
-	 * @model required="true"
-	 * @generated
-	 */
-	String getFirstName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.documentation.plugin.documentation.Person#getFirstName <em>First Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>First Name</em>' attribute.
-	 * @see #getFirstName()
-	 * @generated
-	 */
-	void setFirstName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Last Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Last Name</em>' attribute isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the value of the '<em>Last Name</em>' attribute.
-	 * @see #setLastName(String)
-	 * @see org.eclipse.papyrus.documentation.plugin.documentation.DocumentationPackage#getPerson_LastName()
-	 * @model required="true"
-	 * @generated
-	 */
-	String getLastName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.documentation.plugin.documentation.Person#getLastName <em>Last Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Last Name</em>' attribute.
-	 * @see #getLastName()
-	 * @generated
-	 */
-	void setLastName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>EMail</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>EMail</em>' attribute isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the value of the '<em>EMail</em>' attribute.
-	 * @see #setEMail(String)
-	 * @see org.eclipse.papyrus.documentation.plugin.documentation.DocumentationPackage#getPerson_EMail()
-	 * @model required="true"
-	 * @generated
-	 */
-	String getEMail();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.documentation.plugin.documentation.Person#getEMail <em>EMail</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>EMail</em>' attribute.
-	 * @see #getEMail()
-	 * @generated
-	 */
-	void setEMail(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Current Company</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Current Company</em>' attribute isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the value of the '<em>Current Company</em>' attribute.
-	 * @see #setCurrentCompany(String)
-	 * @see org.eclipse.papyrus.documentation.plugin.documentation.DocumentationPackage#getPerson_CurrentCompany()
-	 * @model
-	 * @generated
-	 */
-	String getCurrentCompany();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.documentation.plugin.documentation.Person#getCurrentCompany <em>Current Company</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @param value
-	 *            the new value of the '<em>Current Company</em>' attribute.
-	 * @see #getCurrentCompany()
-	 * @generated
-	 */
-	void setCurrentCompany(String value);
-
-} // Person
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/impl/CommentImpl.java b/plugins/developer/org.eclipse.papyrus.documentation.plugin/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/impl/CommentImpl.java
deleted file mode 100644
index a44b0000274..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/impl/CommentImpl.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.documentation.plugin.documentation.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.EModelElementImpl;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.papyrus.documentation.plugin.documentation.Comment;
-import org.eclipse.papyrus.documentation.plugin.documentation.DocumentationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Comment</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.papyrus.documentation.plugin.documentation.impl.CommentImpl#getTitle <em>Title</em>}</li>
- * <li>{@link org.eclipse.papyrus.documentation.plugin.documentation.impl.CommentImpl#getContents <em>Contents</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class CommentImpl extends EModelElementImpl implements Comment {
-	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getTitle()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TITLE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getTitle()
-	 * @generated
-	 * @ordered
-	 */
-	protected String title = TITLE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getContents() <em>Contents</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getContents()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CONTENTS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getContents() <em>Contents</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getContents()
-	 * @generated
-	 * @ordered
-	 */
-	protected String contents = CONTENTS_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected CommentImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return DocumentationPackage.Literals.COMMENT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public String getTitle() {
-		return title;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void setTitle(String newTitle) {
-		String oldTitle = title;
-		title = newTitle;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, DocumentationPackage.COMMENT__TITLE, oldTitle, title));
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public String getContents() {
-		return contents;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void setContents(String newContents) {
-		String oldContents = contents;
-		contents = newContents;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, DocumentationPackage.COMMENT__CONTENTS, oldContents, contents));
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case DocumentationPackage.COMMENT__TITLE:
-			return getTitle();
-		case DocumentationPackage.COMMENT__CONTENTS:
-			return getContents();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case DocumentationPackage.COMMENT__TITLE:
-			setTitle((String) newValue);
-			return;
-		case DocumentationPackage.COMMENT__CONTENTS:
-			setContents((String) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case DocumentationPackage.COMMENT__TITLE:
-			setTitle(TITLE_EDEFAULT);
-			return;
-		case DocumentationPackage.COMMENT__CONTENTS:
-			setContents(CONTENTS_EDEFAULT);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case DocumentationPackage.COMMENT__TITLE:
-			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
-		case DocumentationPackage.COMMENT__CONTENTS:
-			return CONTENTS_EDEFAULT == null ? contents != null : !CONTENTS_EDEFAULT.equals(contents);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) {
-			return super.toString();
-		}
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (title: ");
-		result.append(title);
-		result.append(", contents: ");
-		result.append(contents);
-		result.append(')');
-		return result.toString();
-	}
-
-} // CommentImpl
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/impl/DependencyImpl.java b/plugins/developer/org.eclipse.papyrus.documentation.plugin/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/impl/DependencyImpl.java
deleted file mode 100644
index 9c2d9528fc5..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/impl/DependencyImpl.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.documentation.plugin.documentation.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.EModelElementImpl;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.papyrus.documentation.plugin.documentation.Dependency;
-import org.eclipse.papyrus.documentation.plugin.documentation.DocumentationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Dependency</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.papyrus.documentation.plugin.documentation.impl.DependencyImpl#getPlugin <em>Plugin</em>}</li>
- * <li>{@link org.eclipse.papyrus.documentation.plugin.documentation.impl.DependencyImpl#getComment <em>Comment</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DependencyImpl extends EModelElementImpl implements Dependency {
-	/**
-	 * The default value of the '{@link #getPlugin() <em>Plugin</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getPlugin()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PLUGIN_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPlugin() <em>Plugin</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getPlugin()
-	 * @generated
-	 * @ordered
-	 */
-	protected String plugin = PLUGIN_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getComment() <em>Comment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getComment()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String COMMENT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getComment() <em>Comment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getComment()
-	 * @generated
-	 * @ordered
-	 */
-	protected String comment = COMMENT_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected DependencyImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return DocumentationPackage.Literals.DEPENDENCY;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public String getPlugin() {
-		return plugin;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void setPlugin(String newPlugin) {
-		String oldPlugin = plugin;
-		plugin = newPlugin;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, DocumentationPackage.DEPENDENCY__PLUGIN, oldPlugin, plugin));
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public String getComment() {
-		return comment;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void setComment(String newComment) {
-		String oldComment = comment;
-		comment = newComment;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, DocumentationPackage.DEPENDENCY__COMMENT, oldComment, comment));
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case DocumentationPackage.DEPENDENCY__PLUGIN:
-			return getPlugin();
-		case DocumentationPackage.DEPENDENCY__COMMENT:
-			return getComment();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case DocumentationPackage.DEPENDENCY__PLUGIN:
-			setPlugin((String) newValue);
-			return;
-		case DocumentationPackage.DEPENDENCY__COMMENT:
-			setComment((String) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case DocumentationPackage.DEPENDENCY__PLUGIN:
-			setPlugin(PLUGIN_EDEFAULT);
-			return;
-		case DocumentationPackage.DEPENDENCY__COMMENT:
-			setComment(COMMENT_EDEFAULT);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case DocumentationPackage.DEPENDENCY__PLUGIN:
-			return PLUGIN_EDEFAULT == null ? plugin != null : !PLUGIN_EDEFAULT.equals(plugin);
-		case DocumentationPackage.DEPENDENCY__COMMENT:
-			return COMMENT_EDEFAULT == null ? comment != null : !COMMENT_EDEFAULT.equals(comment);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) {
-			return super.toString();
-		}
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (plugin: ");
-		result.append(plugin);
-		result.append(", comment: ");
-		result.append(comment);
-		result.append(')');
-		return result.toString();
-	}
-
-} // DependencyImpl
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/impl/DocumentationFactoryImpl.java b/plugins/developer/org.eclipse.papyrus.documentation.plugin/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/impl/DocumentationFactoryImpl.java
deleted file mode 100644
index f57c5b31334..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/impl/DocumentationFactoryImpl.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.documentation.plugin.documentation.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.papyrus.documentation.plugin.documentation.Comment;
-import org.eclipse.papyrus.documentation.plugin.documentation.Dependency;
-import org.eclipse.papyrus.documentation.plugin.documentation.Documentation;
-import org.eclipse.papyrus.documentation.plugin.documentation.DocumentationFactory;
-import org.eclipse.papyrus.documentation.plugin.documentation.DocumentationPackage;
-import org.eclipse.papyrus.documentation.plugin.documentation.FileDependency;
-import org.eclipse.papyrus.documentation.plugin.documentation.Person;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class DocumentationFactoryImpl extends EFactoryImpl implements DocumentationFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public static DocumentationFactory init() {
-		try {
-			DocumentationFactory theDocumentationFactory = (DocumentationFactory) EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/papyrus/documentation/plugin/documentation");
-			if (theDocumentationFactory != null) {
-				return theDocumentationFactory;
-			}
-		} catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new DocumentationFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public DocumentationFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-		case DocumentationPackage.DOCUMENTATION:
-			return createDocumentation();
-		case DocumentationPackage.DEPENDENCY:
-			return createDependency();
-		case DocumentationPackage.FILE_DEPENDENCY:
-			return createFileDependency();
-		case DocumentationPackage.PERSON:
-			return createPerson();
-		case DocumentationPackage.COMMENT:
-			return createComment();
-		default:
-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public Documentation createDocumentation() {
-		DocumentationImpl documentation = new DocumentationImpl();
-		return documentation;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public Dependency createDependency() {
-		DependencyImpl dependency = new DependencyImpl();
-		return dependency;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public FileDependency createFileDependency() {
-		FileDependencyImpl fileDependency = new FileDependencyImpl();
-		return fileDependency;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public Person createPerson() {
-		PersonImpl person = new PersonImpl();
-		return person;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public Comment createComment() {
-		CommentImpl comment = new CommentImpl();
-		return comment;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public DocumentationPackage getDocumentationPackage() {
-		return (DocumentationPackage) getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static DocumentationPackage getPackage() {
-		return DocumentationPackage.eINSTANCE;
-	}
-
-} // DocumentationFactoryImpl
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/impl/DocumentationImpl.java b/plugins/developer/org.eclipse.papyrus.documentation.plugin/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/impl/DocumentationImpl.java
deleted file mode 100644
index 4a98e658d2b..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/impl/DocumentationImpl.java
+++ /dev/null
@@ -1,316 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.documentation.plugin.documentation.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EModelElementImpl;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.papyrus.documentation.plugin.documentation.Comment;
-import org.eclipse.papyrus.documentation.plugin.documentation.Dependency;
-import org.eclipse.papyrus.documentation.plugin.documentation.Documentation;
-import org.eclipse.papyrus.documentation.plugin.documentation.DocumentationPackage;
-import org.eclipse.papyrus.documentation.plugin.documentation.Person;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Documentation</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.papyrus.documentation.plugin.documentation.impl.DocumentationImpl#getDescription <em>Description</em>}</li>
- * <li>{@link org.eclipse.papyrus.documentation.plugin.documentation.impl.DocumentationImpl#getImplicitDependencies <em>Implicit Dependencies</em>}</li>
- * <li>{@link org.eclipse.papyrus.documentation.plugin.documentation.impl.DocumentationImpl#getReferent <em>Referent</em>}</li>
- * <li>{@link org.eclipse.papyrus.documentation.plugin.documentation.impl.DocumentationImpl#getAdditionalComments <em>Additional Comments</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DocumentationImpl extends EModelElementImpl implements Documentation {
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getImplicitDependencies() <em>Implicit Dependencies</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getImplicitDependencies()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<Dependency> implicitDependencies;
-
-	/**
-	 * The cached value of the '{@link #getReferent() <em>Referent</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getReferent()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<Person> referent;
-
-	/**
-	 * The cached value of the '{@link #getAdditionalComments() <em>Additional Comments</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getAdditionalComments()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<Comment> additionalComments;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected DocumentationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return DocumentationPackage.Literals.DOCUMENTATION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, DocumentationPackage.DOCUMENTATION__DESCRIPTION, oldDescription, description));
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EList<Dependency> getImplicitDependencies() {
-		if (implicitDependencies == null) {
-			implicitDependencies = new EObjectContainmentEList<Dependency>(Dependency.class, this, DocumentationPackage.DOCUMENTATION__IMPLICIT_DEPENDENCIES);
-		}
-		return implicitDependencies;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EList<Person> getReferent() {
-		if (referent == null) {
-			referent = new EObjectContainmentEList<Person>(Person.class, this, DocumentationPackage.DOCUMENTATION__REFERENT);
-		}
-		return referent;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EList<Comment> getAdditionalComments() {
-		if (additionalComments == null) {
-			additionalComments = new EObjectContainmentEList<Comment>(Comment.class, this, DocumentationPackage.DOCUMENTATION__ADDITIONAL_COMMENTS);
-		}
-		return additionalComments;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case DocumentationPackage.DOCUMENTATION__IMPLICIT_DEPENDENCIES:
-			return ((InternalEList<?>) getImplicitDependencies()).basicRemove(otherEnd, msgs);
-		case DocumentationPackage.DOCUMENTATION__REFERENT:
-			return ((InternalEList<?>) getReferent()).basicRemove(otherEnd, msgs);
-		case DocumentationPackage.DOCUMENTATION__ADDITIONAL_COMMENTS:
-			return ((InternalEList<?>) getAdditionalComments()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case DocumentationPackage.DOCUMENTATION__DESCRIPTION:
-			return getDescription();
-		case DocumentationPackage.DOCUMENTATION__IMPLICIT_DEPENDENCIES:
-			return getImplicitDependencies();
-		case DocumentationPackage.DOCUMENTATION__REFERENT:
-			return getReferent();
-		case DocumentationPackage.DOCUMENTATION__ADDITIONAL_COMMENTS:
-			return getAdditionalComments();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case DocumentationPackage.DOCUMENTATION__DESCRIPTION:
-			setDescription((String) newValue);
-			return;
-		case DocumentationPackage.DOCUMENTATION__IMPLICIT_DEPENDENCIES:
-			getImplicitDependencies().clear();
-			getImplicitDependencies().addAll((Collection<? extends Dependency>) newValue);
-			return;
-		case DocumentationPackage.DOCUMENTATION__REFERENT:
-			getReferent().clear();
-			getReferent().addAll((Collection<? extends Person>) newValue);
-			return;
-		case DocumentationPackage.DOCUMENTATION__ADDITIONAL_COMMENTS:
-			getAdditionalComments().clear();
-			getAdditionalComments().addAll((Collection<? extends Comment>) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case DocumentationPackage.DOCUMENTATION__DESCRIPTION:
-			setDescription(DESCRIPTION_EDEFAULT);
-			return;
-		case DocumentationPackage.DOCUMENTATION__IMPLICIT_DEPENDENCIES:
-			getImplicitDependencies().clear();
-			return;
-		case DocumentationPackage.DOCUMENTATION__REFERENT:
-			getReferent().clear();
-			return;
-		case DocumentationPackage.DOCUMENTATION__ADDITIONAL_COMMENTS:
-			getAdditionalComments().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case DocumentationPackage.DOCUMENTATION__DESCRIPTION:
-			return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-		case DocumentationPackage.DOCUMENTATION__IMPLICIT_DEPENDENCIES:
-			return implicitDependencies != null && !implicitDependencies.isEmpty();
-		case DocumentationPackage.DOCUMENTATION__REFERENT:
-			return referent != null && !referent.isEmpty();
-		case DocumentationPackage.DOCUMENTATION__ADDITIONAL_COMMENTS:
-			return additionalComments != null && !additionalComments.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) {
-			return super.toString();
-		}
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (description: ");
-		result.append(description);
-		result.append(')');
-		return result.toString();
-	}
-
-} // DocumentationImpl
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/impl/DocumentationPackageImpl.java b/plugins/developer/org.eclipse.papyrus.documentation.plugin/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/impl/DocumentationPackageImpl.java
deleted file mode 100644
index 4573eb2a977..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/impl/DocumentationPackageImpl.java
+++ /dev/null
@@ -1,442 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.documentation.plugin.documentation.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.papyrus.documentation.plugin.documentation.Comment;
-import org.eclipse.papyrus.documentation.plugin.documentation.Dependency;
-import org.eclipse.papyrus.documentation.plugin.documentation.Documentation;
-import org.eclipse.papyrus.documentation.plugin.documentation.DocumentationFactory;
-import org.eclipse.papyrus.documentation.plugin.documentation.DocumentationPackage;
-import org.eclipse.papyrus.documentation.plugin.documentation.FileDependency;
-import org.eclipse.papyrus.documentation.plugin.documentation.Person;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class DocumentationPackageImpl extends EPackageImpl implements DocumentationPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private EClass documentationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private EClass dependencyEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private EClass fileDependencyEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private EClass personEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private EClass commentEClass = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>
-	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.papyrus.documentation.plugin.documentation.DocumentationPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private DocumentationPackageImpl() {
-		super(eNS_URI, DocumentationFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 *
-	 * <p>
-	 * This method is used to initialize {@link DocumentationPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc
-	 * -->
-	 *
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static DocumentationPackage init() {
-		if (isInited) {
-			return (DocumentationPackage) EPackage.Registry.INSTANCE.getEPackage(DocumentationPackage.eNS_URI);
-		}
-
-		// Obtain or create and register package
-		DocumentationPackageImpl theDocumentationPackage = (DocumentationPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof DocumentationPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new DocumentationPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		EcorePackage.eINSTANCE.eClass();
-
-		// Create package meta-data objects
-		theDocumentationPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theDocumentationPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theDocumentationPackage.freeze();
-
-
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(DocumentationPackage.eNS_URI, theDocumentationPackage);
-		return theDocumentationPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EClass getDocumentation() {
-		return documentationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EAttribute getDocumentation_Description() {
-		return (EAttribute) documentationEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EReference getDocumentation_ImplicitDependencies() {
-		return (EReference) documentationEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EReference getDocumentation_Referent() {
-		return (EReference) documentationEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EReference getDocumentation_AdditionalComments() {
-		return (EReference) documentationEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EClass getDependency() {
-		return dependencyEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EAttribute getDependency_Plugin() {
-		return (EAttribute) dependencyEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EAttribute getDependency_Comment() {
-		return (EAttribute) dependencyEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EClass getFileDependency() {
-		return fileDependencyEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EAttribute getFileDependency_File() {
-		return (EAttribute) fileDependencyEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EClass getPerson() {
-		return personEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EAttribute getPerson_FirstName() {
-		return (EAttribute) personEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EAttribute getPerson_LastName() {
-		return (EAttribute) personEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EAttribute getPerson_EMail() {
-		return (EAttribute) personEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EAttribute getPerson_CurrentCompany() {
-		return (EAttribute) personEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EClass getComment() {
-		return commentEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EAttribute getComment_Title() {
-		return (EAttribute) commentEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public EAttribute getComment_Contents() {
-		return (EAttribute) commentEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public DocumentationFactory getDocumentationFactory() {
-		return (DocumentationFactory) getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package. This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) {
-			return;
-		}
-		isCreated = true;
-
-		// Create classes and their features
-		documentationEClass = createEClass(DOCUMENTATION);
-		createEAttribute(documentationEClass, DOCUMENTATION__DESCRIPTION);
-		createEReference(documentationEClass, DOCUMENTATION__IMPLICIT_DEPENDENCIES);
-		createEReference(documentationEClass, DOCUMENTATION__REFERENT);
-		createEReference(documentationEClass, DOCUMENTATION__ADDITIONAL_COMMENTS);
-
-		dependencyEClass = createEClass(DEPENDENCY);
-		createEAttribute(dependencyEClass, DEPENDENCY__PLUGIN);
-		createEAttribute(dependencyEClass, DEPENDENCY__COMMENT);
-
-		fileDependencyEClass = createEClass(FILE_DEPENDENCY);
-		createEAttribute(fileDependencyEClass, FILE_DEPENDENCY__FILE);
-
-		personEClass = createEClass(PERSON);
-		createEAttribute(personEClass, PERSON__FIRST_NAME);
-		createEAttribute(personEClass, PERSON__LAST_NAME);
-		createEAttribute(personEClass, PERSON__EMAIL);
-		createEAttribute(personEClass, PERSON__CURRENT_COMPANY);
-
-		commentEClass = createEClass(COMMENT);
-		createEAttribute(commentEClass, COMMENT__TITLE);
-		createEAttribute(commentEClass, COMMENT__CONTENTS);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model. This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) {
-			return;
-		}
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		EcorePackage theEcorePackage = (EcorePackage) EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
-
-		// Create type parameters
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-		documentationEClass.getESuperTypes().add(theEcorePackage.getEModelElement());
-		dependencyEClass.getESuperTypes().add(theEcorePackage.getEModelElement());
-		fileDependencyEClass.getESuperTypes().add(this.getDependency());
-		personEClass.getESuperTypes().add(theEcorePackage.getEModelElement());
-		commentEClass.getESuperTypes().add(theEcorePackage.getEModelElement());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(documentationEClass, Documentation.class, "Documentation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getDocumentation_Description(), ecorePackage.getEString(), "description", null, 1, 1, Documentation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getDocumentation_ImplicitDependencies(), this.getDependency(), null, "implicitDependencies", null, 0, -1, Documentation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-				!IS_DERIVED, IS_ORDERED);
-		initEReference(getDocumentation_Referent(), this.getPerson(), null, "referent", null, 0, -1, Documentation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getDocumentation_AdditionalComments(), this.getComment(), null, "additionalComments", null, 0, -1, Documentation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-				!IS_DERIVED, IS_ORDERED);
-
-		initEClass(dependencyEClass, Dependency.class, "Dependency", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getDependency_Plugin(), ecorePackage.getEString(), "plugin", null, 1, 1, Dependency.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getDependency_Comment(), ecorePackage.getEString(), "comment", null, 1, 1, Dependency.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(fileDependencyEClass, FileDependency.class, "FileDependency", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getFileDependency_File(), theEcorePackage.getEString(), "file", null, 1, 1, FileDependency.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(personEClass, Person.class, "Person", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getPerson_FirstName(), ecorePackage.getEString(), "firstName", null, 1, 1, Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPerson_LastName(), ecorePackage.getEString(), "lastName", null, 1, 1, Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPerson_EMail(), ecorePackage.getEString(), "eMail", null, 1, 1, Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPerson_CurrentCompany(), ecorePackage.getEString(), "currentCompany", null, 0, 1, Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(commentEClass, Comment.class, "Comment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getComment_Title(), ecorePackage.getEString(), "title", null, 1, 1, Comment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getComment_Contents(), ecorePackage.getEString(), "contents", null, 1, 1, Comment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-
-} // DocumentationPackageImpl
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/impl/FileDependencyImpl.java b/plugins/developer/org.eclipse.papyrus.documentation.plugin/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/impl/FileDependencyImpl.java
deleted file mode 100644
index 5df91a7d7d6..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/impl/FileDependencyImpl.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.documentation.plugin.documentation.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.papyrus.documentation.plugin.documentation.DocumentationPackage;
-import org.eclipse.papyrus.documentation.plugin.documentation.FileDependency;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>File Dependency</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.papyrus.documentation.plugin.documentation.impl.FileDependencyImpl#getFile <em>File</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class FileDependencyImpl extends DependencyImpl implements FileDependency {
-	/**
-	 * The default value of the '{@link #getFile() <em>File</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getFile()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String FILE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getFile() <em>File</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getFile()
-	 * @generated
-	 * @ordered
-	 */
-	protected String file = FILE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected FileDependencyImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return DocumentationPackage.Literals.FILE_DEPENDENCY;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public String getFile() {
-		return file;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void setFile(String newFile) {
-		String oldFile = file;
-		file = newFile;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, DocumentationPackage.FILE_DEPENDENCY__FILE, oldFile, file));
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case DocumentationPackage.FILE_DEPENDENCY__FILE:
-			return getFile();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case DocumentationPackage.FILE_DEPENDENCY__FILE:
-			setFile((String) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case DocumentationPackage.FILE_DEPENDENCY__FILE:
-			setFile(FILE_EDEFAULT);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case DocumentationPackage.FILE_DEPENDENCY__FILE:
-			return FILE_EDEFAULT == null ? file != null : !FILE_EDEFAULT.equals(file);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) {
-			return super.toString();
-		}
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (file: ");
-		result.append(file);
-		result.append(')');
-		return result.toString();
-	}
-
-} // FileDependencyImpl
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/impl/PersonImpl.java b/plugins/developer/org.eclipse.papyrus.documentation.plugin/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/impl/PersonImpl.java
deleted file mode 100644
index 446b83a7a04..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/impl/PersonImpl.java
+++ /dev/null
@@ -1,355 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.documentation.plugin.documentation.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.EModelElementImpl;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.papyrus.documentation.plugin.documentation.DocumentationPackage;
-import org.eclipse.papyrus.documentation.plugin.documentation.Person;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Person</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.papyrus.documentation.plugin.documentation.impl.PersonImpl#getFirstName <em>First Name</em>}</li>
- * <li>{@link org.eclipse.papyrus.documentation.plugin.documentation.impl.PersonImpl#getLastName <em>Last Name</em>}</li>
- * <li>{@link org.eclipse.papyrus.documentation.plugin.documentation.impl.PersonImpl#getEMail <em>EMail</em>}</li>
- * <li>{@link org.eclipse.papyrus.documentation.plugin.documentation.impl.PersonImpl#getCurrentCompany <em>Current Company</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PersonImpl extends EModelElementImpl implements Person {
-	/**
-	 * The default value of the '{@link #getFirstName() <em>First Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getFirstName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String FIRST_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getFirstName() <em>First Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getFirstName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String firstName = FIRST_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLastName() <em>Last Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getLastName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LAST_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLastName() <em>Last Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getLastName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String lastName = LAST_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getEMail() <em>EMail</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getEMail()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String EMAIL_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getEMail() <em>EMail</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getEMail()
-	 * @generated
-	 * @ordered
-	 */
-	protected String eMail = EMAIL_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getCurrentCompany() <em>Current Company</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getCurrentCompany()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CURRENT_COMPANY_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCurrentCompany() <em>Current Company</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @see #getCurrentCompany()
-	 * @generated
-	 * @ordered
-	 */
-	protected String currentCompany = CURRENT_COMPANY_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected PersonImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return DocumentationPackage.Literals.PERSON;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public String getFirstName() {
-		return firstName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void setFirstName(String newFirstName) {
-		String oldFirstName = firstName;
-		firstName = newFirstName;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, DocumentationPackage.PERSON__FIRST_NAME, oldFirstName, firstName));
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public String getLastName() {
-		return lastName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void setLastName(String newLastName) {
-		String oldLastName = lastName;
-		lastName = newLastName;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, DocumentationPackage.PERSON__LAST_NAME, oldLastName, lastName));
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public String getEMail() {
-		return eMail;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void setEMail(String newEMail) {
-		String oldEMail = eMail;
-		eMail = newEMail;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, DocumentationPackage.PERSON__EMAIL, oldEMail, eMail));
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public String getCurrentCompany() {
-		return currentCompany;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public void setCurrentCompany(String newCurrentCompany) {
-		String oldCurrentCompany = currentCompany;
-		currentCompany = newCurrentCompany;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, DocumentationPackage.PERSON__CURRENT_COMPANY, oldCurrentCompany, currentCompany));
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case DocumentationPackage.PERSON__FIRST_NAME:
-			return getFirstName();
-		case DocumentationPackage.PERSON__LAST_NAME:
-			return getLastName();
-		case DocumentationPackage.PERSON__EMAIL:
-			return getEMail();
-		case DocumentationPackage.PERSON__CURRENT_COMPANY:
-			return getCurrentCompany();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case DocumentationPackage.PERSON__FIRST_NAME:
-			setFirstName((String) newValue);
-			return;
-		case DocumentationPackage.PERSON__LAST_NAME:
-			setLastName((String) newValue);
-			return;
-		case DocumentationPackage.PERSON__EMAIL:
-			setEMail((String) newValue);
-			return;
-		case DocumentationPackage.PERSON__CURRENT_COMPANY:
-			setCurrentCompany((String) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case DocumentationPackage.PERSON__FIRST_NAME:
-			setFirstName(FIRST_NAME_EDEFAULT);
-			return;
-		case DocumentationPackage.PERSON__LAST_NAME:
-			setLastName(LAST_NAME_EDEFAULT);
-			return;
-		case DocumentationPackage.PERSON__EMAIL:
-			setEMail(EMAIL_EDEFAULT);
-			return;
-		case DocumentationPackage.PERSON__CURRENT_COMPANY:
-			setCurrentCompany(CURRENT_COMPANY_EDEFAULT);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case DocumentationPackage.PERSON__FIRST_NAME:
-			return FIRST_NAME_EDEFAULT == null ? firstName != null : !FIRST_NAME_EDEFAULT.equals(firstName);
-		case DocumentationPackage.PERSON__LAST_NAME:
-			return LAST_NAME_EDEFAULT == null ? lastName != null : !LAST_NAME_EDEFAULT.equals(lastName);
-		case DocumentationPackage.PERSON__EMAIL:
-			return EMAIL_EDEFAULT == null ? eMail != null : !EMAIL_EDEFAULT.equals(eMail);
-		case DocumentationPackage.PERSON__CURRENT_COMPANY:
-			return CURRENT_COMPANY_EDEFAULT == null ? currentCompany != null : !CURRENT_COMPANY_EDEFAULT.equals(currentCompany);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) {
-			return super.toString();
-		}
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (firstName: ");
-		result.append(firstName);
-		result.append(", lastName: ");
-		result.append(lastName);
-		result.append(", eMail: ");
-		result.append(eMail);
-		result.append(", currentCompany: ");
-		result.append(currentCompany);
-		result.append(')');
-		return result.toString();
-	}
-
-} // PersonImpl
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/util/DocumentationAdapterFactory.java b/plugins/developer/org.eclipse.papyrus.documentation.plugin/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/util/DocumentationAdapterFactory.java
deleted file mode 100644
index db77c40c55e..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/util/DocumentationAdapterFactory.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.documentation.plugin.documentation.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.documentation.plugin.documentation.Comment;
-import org.eclipse.papyrus.documentation.plugin.documentation.Dependency;
-import org.eclipse.papyrus.documentation.plugin.documentation.Documentation;
-import org.eclipse.papyrus.documentation.plugin.documentation.DocumentationPackage;
-import org.eclipse.papyrus.documentation.plugin.documentation.FileDependency;
-import org.eclipse.papyrus.documentation.plugin.documentation.Person;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.documentation.plugin.documentation.DocumentationPackage
- * @generated
- */
-public class DocumentationAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected static DocumentationPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public DocumentationAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = DocumentationPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject) object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch that delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected DocumentationSwitch<Adapter> modelSwitch =
-			new DocumentationSwitch<Adapter>() {
-				@Override
-				public Adapter caseDocumentation(Documentation object) {
-					return createDocumentationAdapter();
-				}
-
-				@Override
-				public Adapter caseDependency(Dependency object) {
-					return createDependencyAdapter();
-				}
-
-				@Override
-				public Adapter caseFileDependency(FileDependency object) {
-					return createFileDependencyAdapter();
-				}
-
-				@Override
-				public Adapter casePerson(Person object) {
-					return createPersonAdapter();
-				}
-
-				@Override
-				public Adapter caseComment(Comment object) {
-					return createCommentAdapter();
-				}
-
-				@Override
-				public Adapter caseEModelElement(EModelElement object) {
-					return createEModelElementAdapter();
-				}
-
-				@Override
-				public Adapter defaultCase(EObject object) {
-					return createEObjectAdapter();
-				}
-			};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @param target
-	 *            the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	@Override
-	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject) target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.documentation.plugin.documentation.Documentation <em>Documentation</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.documentation.plugin.documentation.Documentation
-	 * @generated
-	 */
-	public Adapter createDocumentationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.documentation.plugin.documentation.Dependency <em>Dependency</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.documentation.plugin.documentation.Dependency
-	 * @generated
-	 */
-	public Adapter createDependencyAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.documentation.plugin.documentation.FileDependency <em>File Dependency</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.documentation.plugin.documentation.FileDependency
-	 * @generated
-	 */
-	public Adapter createFileDependencyAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.documentation.plugin.documentation.Person <em>Person</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.documentation.plugin.documentation.Person
-	 * @generated
-	 */
-	public Adapter createPersonAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.documentation.plugin.documentation.Comment <em>Comment</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.documentation.plugin.documentation.Comment
-	 * @generated
-	 */
-	public Adapter createCommentAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.ecore.EModelElement <em>EModel Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @see org.eclipse.emf.ecore.EModelElement
-	 * @generated
-	 */
-	public Adapter createEModelElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} // DocumentationAdapterFactory
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/util/DocumentationSwitch.java b/plugins/developer/org.eclipse.papyrus.documentation.plugin/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/util/DocumentationSwitch.java
deleted file mode 100644
index 8a1fa4a1d57..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin/src-gen/org/eclipse/papyrus/documentation/plugin/documentation/util/DocumentationSwitch.java
+++ /dev/null
@@ -1,264 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.documentation.plugin.documentation.util;
-
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.util.Switch;
-import org.eclipse.papyrus.documentation.plugin.documentation.Comment;
-import org.eclipse.papyrus.documentation.plugin.documentation.Dependency;
-import org.eclipse.papyrus.documentation.plugin.documentation.Documentation;
-import org.eclipse.papyrus.documentation.plugin.documentation.DocumentationPackage;
-import org.eclipse.papyrus.documentation.plugin.documentation.FileDependency;
-import org.eclipse.papyrus.documentation.plugin.documentation.Person;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.papyrus.documentation.plugin.documentation.DocumentationPackage
- * @generated
- */
-public class DocumentationSwitch<T> extends Switch<T> {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	protected static DocumentationPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @generated
-	 */
-	public DocumentationSwitch() {
-		if (modelPackage == null) {
-			modelPackage = DocumentationPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Checks whether this is a switch for the given package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @parameter ePackage the package in question.
-	 * @return whether this is a switch for the given package.
-	 * @generated
-	 */
-	@Override
-	protected boolean isSwitchFor(EPackage ePackage) {
-		return ePackage == modelPackage;
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 *
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	@Override
-	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-		case DocumentationPackage.DOCUMENTATION: {
-			Documentation documentation = (Documentation) theEObject;
-			T result = caseDocumentation(documentation);
-			if (result == null) {
-				result = caseEModelElement(documentation);
-			}
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		case DocumentationPackage.DEPENDENCY: {
-			Dependency dependency = (Dependency) theEObject;
-			T result = caseDependency(dependency);
-			if (result == null) {
-				result = caseEModelElement(dependency);
-			}
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		case DocumentationPackage.FILE_DEPENDENCY: {
-			FileDependency fileDependency = (FileDependency) theEObject;
-			T result = caseFileDependency(fileDependency);
-			if (result == null) {
-				result = caseDependency(fileDependency);
-			}
-			if (result == null) {
-				result = caseEModelElement(fileDependency);
-			}
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		case DocumentationPackage.PERSON: {
-			Person person = (Person) theEObject;
-			T result = casePerson(person);
-			if (result == null) {
-				result = caseEModelElement(person);
-			}
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		case DocumentationPackage.COMMENT: {
-			Comment comment = (Comment) theEObject;
-			T result = caseComment(comment);
-			if (result == null) {
-				result = caseEModelElement(comment);
-			}
-			if (result == null) {
-				result = defaultCase(theEObject);
-			}
-			return result;
-		}
-		default:
-			return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Documentation</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Documentation</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseDocumentation(Documentation object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Dependency</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Dependency</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseDependency(Dependency object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>File Dependency</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>File Dependency</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseFileDependency(FileDependency object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Person</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Person</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T casePerson(Person object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Comment</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Comment</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseComment(Comment object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EModel Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EModel Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseEModelElement(EModelElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 *
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	@Override
-	public T defaultCase(EObject object) {
-		return null;
-	}
-
-} // DocumentationSwitch
diff --git a/plugins/developer/org.eclipse.papyrus.documentation.plugin/src/org/eclipse/papyrus/documentation/plugin/Activator.java b/plugins/developer/org.eclipse.papyrus.documentation.plugin/src/org/eclipse/papyrus/documentation/plugin/Activator.java
deleted file mode 100644
index ee4d87f9a93..00000000000
--- a/plugins/developer/org.eclipse.papyrus.documentation.plugin/src/org/eclipse/papyrus/documentation/plugin/Activator.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.eclipse.papyrus.documentation.plugin;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.papyrus.documentation.plugin"; //$NON-NLS-1$
-
-	// The shared instance
-	private static Activator plugin;
-
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/META-INF/MANIFEST.MF b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/META-INF/MANIFEST.MF
index 2187bfc64db..e3822fd03af 100644
--- a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/META-INF/MANIFEST.MF
+++ b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/META-INF/MANIFEST.MF
@@ -1,32 +1,32 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.1.0",
- org.eclipse.emf;bundle-version="2.6.0",
- org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.1.0",
- org.eclipse.uml2.uml,
- org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
- org.eclipse.papyrus.editor;bundle-version="1.1.0",
- org.eclipse.gmf.runtime.notation.edit,
- org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.gmf.runtime.diagram.ui.render,
- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",
- org.eclipse.core.resources,
- org.eclipse.papyrus.infra.hyperlink;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.1.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.uml.developper.mde.Activator
-Bundle-Description: The goal of this plugin is to bring a template and
-  profile to document plugins development, transromation to generate d
- ocument model, and  a very simple of document generator.
-Bundle-SymbolicName: org.eclipse.papyrus.uml.developer.mde;singleton:=
- true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-
+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.1.0",
+ org.eclipse.emf;bundle-version="2.6.0",
+ org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.1.0",
+ org.eclipse.uml2.uml,
+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.editor;bundle-version="1.1.0",
+ org.eclipse.gmf.runtime.notation.edit,
+ org.eclipse.gmf.runtime.diagram.ui,
+ org.eclipse.gmf.runtime.diagram.ui.render,
+ org.eclipse.papyrus.views.modelexplorer;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",
+ org.eclipse.core.resources,
+ org.eclipse.papyrus.infra.hyperlink;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.1.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.uml.developper.mde.Activator
+Bundle-Description: The goal of this plugin is to bring a template and
+  profile to document plugins development, transromation to generate d
+ ocument model, and  a very simple of document generator.
+Bundle-SymbolicName: org.eclipse.papyrus.uml.developer.mde;singleton:=
+ true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-Description: %pluginDescription
diff --git a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/build.properties b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/build.properties
index d1b30f2c770..6e76215b84a 100644
--- a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/build.properties
+++ b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/build.properties
@@ -6,6 +6,4 @@ bin.includes = META-INF/,\
                resource/,\
                plugin.properties,\
                about.html,\
-               plugin.pdoc
 src.includes = about.html,\
-               plugin.pdoc
diff --git a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/plugin.pdoc b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/plugin.pdoc
deleted file mode 100644
index 1d02ac1b61d..00000000000
--- a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/plugin.pdoc
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation
-    xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI"
-    xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation"
-    description="The goal of this plugin is to bring a template and profile to document plugins development, transromation to generate document model, and  a very simple of document generator.&#xD;&#xA;">
-  <referent
-      firstName="Patrick"
-      lastName="Tessier"
-      eMail="patrick.tessier@cea.fr"
-      currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/plugin.properties b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/plugin.properties
index 7f2b68445ba..3ce16b96628 100644
--- a/plugins/developer/org.eclipse.papyrus.uml.developer.mde/plugin.properties
+++ b/plugins/developer/org.eclipse.papyrus.uml.developer.mde/plugin.properties
@@ -10,3 +10,5 @@
 ##################################################################################
 pluginName=Developer MDE
 providerName=Eclipse Modeling Project
+
+pluginDescription=The goal of this plugin is to bring a template and profile to document plugins development, transromation to generate document model, and  a very simple of document generator.
+\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/META-INF/MANIFEST.MF
index 487f457657b..ae8ed85c6a2 100644
--- a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/META-INF/MANIFEST.MF
@@ -8,4 +8,4 @@ Bundle-Name: %pluginName
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.cdo.ui.doc;singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-
+Bundle-Description: %pluginDescription
diff --git a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/plugin.pdoc b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/plugin.pdoc
deleted file mode 100644
index 98bb566f408..00000000000
--- a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="End-user documentation for the CDO Integration feature.">
-  <referent firstName="Christian" lastName="Damus" eMail="give.a.damus@gmail.com" currentCompany="(independent committer)"/>
-</doc:Documentation>
diff --git a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/plugin.properties b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/plugin.properties
index 9ef68ffe876..7cb767e5d17 100644
--- a/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/plugin.properties
+++ b/plugins/doc/org.eclipse.papyrus.cdo.ui.doc/plugin.properties
@@ -11,3 +11,5 @@
 
 pluginName=Papyrus CDO Model Repository Documentation
 providerName=Eclipse Modeling Project
+
+pluginDescription=End-user documentation for the CDO Integration feature.
+\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.moka.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.moka.doc/META-INF/MANIFEST.MF
index cd1544ce60d..270c1114d66 100755
--- a/plugins/doc/org.eclipse.papyrus.moka.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.moka.doc/META-INF/MANIFEST.MF
@@ -9,4 +9,4 @@ Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.moka.doc.Activator
 Bundle-SymbolicName: org.eclipse.papyrus.moka.doc;singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-
+Bundle-Description: %pluginDescription
diff --git a/plugins/doc/org.eclipse.papyrus.moka.doc/plugin.pdoc b/plugins/doc/org.eclipse.papyrus.moka.doc/plugin.pdoc
deleted file mode 100755
index d87f4aefba2..00000000000
--- a/plugins/doc/org.eclipse.papyrus.moka.doc/plugin.pdoc
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="End-user documentation for MOKA.">
-  <referent firstName="Arnaud" lastName="Cuccuru" eMail="arnaud.cuccuru@cea.fr" currentCompany="CEA"/>
-  <referent firstName="Jeremie" lastName="Tatibouet" eMail="jeremie.tatibouet@cea.fr" currentCompany="CEA"/>
-  <referent firstName="Bruno" lastName="Marqu�s" eMail="bruno.marques@cea.fr" currentCompany="CEA"/>
-</doc:Documentation>
diff --git a/plugins/doc/org.eclipse.papyrus.moka.doc/plugin.properties b/plugins/doc/org.eclipse.papyrus.moka.doc/plugin.properties
new file mode 100644
index 00000000000..263bc79a6d0
--- /dev/null
+++ b/plugins/doc/org.eclipse.papyrus.moka.doc/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+# Copyright (c) 2015 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
+##################################################################################)
+
+pluginDescription=End-user documentation for MOKA.
+\ No newline at end of file
diff --git a/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/META-INF/MANIFEST.MF b/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/META-INF/MANIFEST.MF
index 04317b214ff..360c7b30eaf 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/META-INF/MANIFEST.MF
+++ b/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/META-INF/MANIFEST.MF
@@ -9,4 +9,4 @@ Bundle-Name: %pluginName
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.uml.decoratormodel.doc;singleton:=true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
+Bundle-Description: %pluginDescription
diff --git a/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/build.properties b/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/build.properties
index 3800c32ae21..ee908ced3ab 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/build.properties
+++ b/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/build.properties
@@ -15,6 +15,5 @@ bin.includes = META-INF/,\
                plugin.xml,\
                plugin.properties,\
                about.html,\
-               resource/,\
-               documentation.pdoc
+               resource/
 src.includes = about.html
diff --git a/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/documentation.pdoc b/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/documentation.pdoc
deleted file mode 100644
index d65ffe1a98a..00000000000
--- a/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/documentation.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="User documentation for externalized profile applications.">
-  <referent firstName="Christian" lastName="Damus" eMail="give.a.damus@gmail.com" currentCompany="independent"/>
-</doc:Documentation>
diff --git a/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/plugin.properties b/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/plugin.properties
index 4082d4aef1a..a9bc02e5d52 100644
--- a/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/plugin.properties
+++ b/plugins/doc/org.eclipse.papyrus.uml.decoratormodel.doc/plugin.properties
@@ -12,3 +12,5 @@
 
 pluginName=Papyrus Profile Applications Documentation
 vendorName=Eclipse Modeling Project
+
+pluginDescription=User documentation for externalized profile applications.
+\ No newline at end of file
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.pluginexplorer/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core.pluginexplorer/META-INF/MANIFEST.MF
index be0c47cafea..610a88e8b47 100755
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.pluginexplorer/META-INF/MANIFEST.MF
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.pluginexplorer/META-INF/MANIFEST.MF
@@ -14,4 +14,4 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.infra.core.pluginexplorer;sin
  gleton:=true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
+Bundle-Description: %pluginDescription
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.pluginexplorer/plugin.properties b/plugins/infra/core/org.eclipse.papyrus.infra.core.pluginexplorer/plugin.properties
index b260cb5b11d..be2f3f88e2b 100755
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.pluginexplorer/plugin.properties
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.pluginexplorer/plugin.properties
@@ -14,3 +14,5 @@
 
 pluginName = Plugin Explorer
 providerName = Eclipse Modeling Project
+
+pluginDescription=This plugin gives access to the inner content of Eclipse plugins
+\ No newline at end of file
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.pluginexplorer/pluginexplorer.pdoc b/plugins/infra/core/org.eclipse.papyrus.infra.core.pluginexplorer/pluginexplorer.pdoc
deleted file mode 100755
index ca34f5f4af0..00000000000
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.pluginexplorer/pluginexplorer.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin gives access to the inner content of Eclipse plugins">
-  <referent firstName="Laurent " lastName="Wouters" eMail="laurent.wouters@cea.fr" currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/META-INF/MANIFEST.MF b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/META-INF/MANIFEST.MF
index c3178310b95..0ddfcf329ba 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/META-INF/MANIFEST.MF
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/META-INF/MANIFEST.MF
@@ -15,4 +15,4 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.infra.discovery.ui.menu;singl
  eton:=true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
+Bundle-Description: %pluginDescription
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/build.properties b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/build.properties
index 765e4128239..1e6d045b32b 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/build.properties
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/build.properties
@@ -1,12 +1,11 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               about.html,\
-               doc/,\
-               icons/,\
-               intro/,\
-               plugin.xml,\
-               plugin.properties
-src.includes = about.html,\
-               plugin.pdoc
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               about.html,\
+               doc/,\
+               icons/,\
+               intro/,\
+               plugin.xml,\
+               plugin.properties
+src.includes = about.html
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/plugin.pdoc b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/plugin.pdoc
deleted file mode 100644
index e43e88a21c6..00000000000
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin contributes to the workbench, in order to have access to the papyrus discovery interface.">
-  <referent firstName="remi" lastName="schnekenburger" eMail="remi.schnekenburger@cea.fr" currentCompany="CEA-LIST"/>
-</doc:Documentation>
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/plugin.properties b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/plugin.properties
index 86d901983c9..d834646cbc7 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/plugin.properties
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui.menu/plugin.properties
@@ -10,3 +10,5 @@
 #  
 pluginName = Papyrus Discovery UI Contributions
 providerName = Eclipse Modeling Project
+
+pluginDescription=This plugin contributes to the workbench, in order to have access to the papyrus discovery interface.
+\ No newline at end of file
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/META-INF/MANIFEST.MF b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/META-INF/MANIFEST.MF
index 0da50bd4ddb..26af34c6b3a 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/META-INF/MANIFEST.MF
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/META-INF/MANIFEST.MF
@@ -30,4 +30,4 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.infra.discovery.ui;singleton:
  =true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
+Bundle-Description: %pluginDescription
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/build.properties b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/build.properties
index c12cd949b3e..ee4164c292f 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/build.properties
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/build.properties
@@ -12,5 +12,4 @@ bin.includes = .,\
 jars.compile.order = .
 source.. = src/
 output.. = bin/
-src.includes = about.html,\
-               plugin.pdoc
+src.includes = about.html
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/plugin.pdoc b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/plugin.pdoc
deleted file mode 100644
index c1bc786b9ac..00000000000
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides the user interface components for the papyrus discovery interface. No contribution to the UI is done by this plugin.">
-  <referent firstName="remi" lastName="schnekenburger" eMail="remi.schnekenburger@cea.fr" currentCompany="CEA-LIST"/>
-</doc:Documentation>
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/plugin.properties b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/plugin.properties
index 71f4507c09e..ab61924c583 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/plugin.properties
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery.ui/plugin.properties
@@ -10,3 +10,5 @@
 #  
 pluginName = Papyrus Discovery UI
 providerName = Eclipse Modeling Project
+
+pluginDescription=This plugin provides the user interface components for the papyrus discovery interface. No contribution to the UI is done by this plugin.
+\ No newline at end of file
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/META-INF/MANIFEST.MF b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/META-INF/MANIFEST.MF
index 0bcafed8a77..a07d22d517e 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/META-INF/MANIFEST.MF
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/META-INF/MANIFEST.MF
@@ -16,4 +16,4 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.infra.discovery;singleton:=tr
  ue
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
+Bundle-Description: %pluginDescription
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/build.properties b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/build.properties
index 6617444e2c8..9952c32f04f 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/build.properties
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/build.properties
@@ -19,4 +19,3 @@ jars.compile.order = .
 source.. = src-gen/
 output.. = bin/
 src.includes = about.html,\
-               plugin.pdoc
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/plugin.pdoc b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/plugin.pdoc
deleted file mode 100644
index e0d9c7c1130..00000000000
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides the content model for the papyrus discovery interface">
-  <referent firstName="remi" lastName="schnekenburger" eMail="remi.schnekenburger@cea.fr" currentCompany="CEA-LIST"/>
-</doc:Documentation>
diff --git a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/plugin.properties b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/plugin.properties
index a455e4c4af2..f77885a493c 100644
--- a/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/plugin.properties
+++ b/plugins/infra/discovery/org.eclipse.papyrus.infra.discovery/plugin.properties
@@ -10,3 +10,5 @@
 #  
 pluginName = Papyrus Discovery Model
 providerName = Eclipse Modeling Project
+
+pluginDescription=This plugin provides the content model for the papyrus discovery interface
+\ No newline at end of file
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF
index 62828ca9f46..642e0657946 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF
@@ -1,46 +1,46 @@
-Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.infra.emf,
- org.eclipse.papyrus.infra.emf.adapters,
- org.eclipse.papyrus.infra.emf.advice,
- org.eclipse.papyrus.infra.emf.commands,
- org.eclipse.papyrus.infra.emf.databinding,
- org.eclipse.papyrus.infra.emf.dialog,
- org.eclipse.papyrus.infra.emf.providers,
- org.eclipse.papyrus.infra.emf.providers.strategy,
- org.eclipse.papyrus.infra.emf.requests,
- org.eclipse.papyrus.infra.emf.resource,
- org.eclipse.papyrus.infra.emf.resource.index,
- org.eclipse.papyrus.infra.emf.utils
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.emf.ecore;bundle-version="2.7.0",
- org.eclipse.emf.edit;bundle-version="2.7.1",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",
- org.eclipse.emf.edit.ui;bundle-version="2.8.0",
- org.eclipse.core.databinding;bundle-version="1.4.1",
- org.eclipse.core.databinding.property;bundle-version="1.4.0",
- org.eclipse.emf.databinding;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",
- org.eclipse.emf.transaction;bundle-version="1.4.0",
- org.eclipse.emf.ecore.xmi,
- com.ibm.icu;bundle-version="4.4.2",
- org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",
- org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",
- org.eclipse.core.expressions;bundle-version="3.4.400",
- org.eclipse.gmf.runtime.common.core;bundle-version="1.7.0",
- org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0",
- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.0"
-Bundle-Vendor: Eclipse Modeling Project
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.1.0.qualifier
-Bundle-Name: EMF Tools
-Bundle-Activator: org.eclipse.papyrus.infra.emf.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.infra.emf;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-
+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.emf,
+ org.eclipse.papyrus.infra.emf.adapters,
+ org.eclipse.papyrus.infra.emf.advice,
+ org.eclipse.papyrus.infra.emf.commands,
+ org.eclipse.papyrus.infra.emf.databinding,
+ org.eclipse.papyrus.infra.emf.dialog,
+ org.eclipse.papyrus.infra.emf.providers,
+ org.eclipse.papyrus.infra.emf.providers.strategy,
+ org.eclipse.papyrus.infra.emf.requests,
+ org.eclipse.papyrus.infra.emf.resource,
+ org.eclipse.papyrus.infra.emf.resource.index,
+ org.eclipse.papyrus.infra.emf.utils
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;bundle-version="2.7.0",
+ org.eclipse.emf.edit;bundle-version="2.7.1",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",
+ org.eclipse.emf.edit.ui;bundle-version="2.8.0",
+ org.eclipse.core.databinding;bundle-version="1.4.1",
+ org.eclipse.core.databinding.property;bundle-version="1.4.0",
+ org.eclipse.emf.databinding;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",
+ org.eclipse.emf.transaction;bundle-version="1.4.0",
+ org.eclipse.emf.ecore.xmi,
+ com.ibm.icu;bundle-version="4.4.2",
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",
+ org.eclipse.gmf.runtime.notation;bundle-version="1.5.0",
+ org.eclipse.core.expressions;bundle-version="3.4.400",
+ org.eclipse.gmf.runtime.common.core;bundle-version="1.7.0",
+ org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.4.0",
+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",
+ com.google.guava;bundle-version="11.0.0",
+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.1.0",
+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.1.0"
+Bundle-Vendor: Eclipse Modeling Project
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.1.0.qualifier
+Bundle-Name: EMF Tools
+Bundle-Activator: org.eclipse.papyrus.infra.emf.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.emf;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-Description: %pluginDescription
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/build.properties b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/build.properties
index fded762df99..1dc054540dd 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/build.properties
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/build.properties
@@ -4,7 +4,6 @@ bin.includes = META-INF/,\
                .,\
                about.html,\
                build.properties,\
-               plugin.pdoc,\
                plugin.xml
 src.includes = about.html,\
                schema/
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/plugin.pdoc b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/plugin.pdoc
deleted file mode 100644
index 0d8bd6f33cd..00000000000
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/plugin.pdoc
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides some classes with dependencies on EMF">
-  <referent firstName="Camille" lastName="Letavernier" eMail="camille.letavernier@cea.fr" currentCompany="CEA-LIST"/>
-  <referent firstName="vincent" lastName="lorenzo" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA-LIST"/>
-</doc:Documentation>
diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf/plugin.properties b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/plugin.properties
new file mode 100644
index 00000000000..ab265261b49
--- /dev/null
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+# Copyright (c) 2015 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
+##################################################################################)
+
+pluginDescription=This plugin provides some classes with dependencies on EMF
+\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/META-INF/MANIFEST.MF
index 78444340412..b45c74ff59c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/META-INF/MANIFEST.MF
@@ -12,4 +12,4 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter;
  singleton:=true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
+Bundle-Description: %pluginDescription
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/build.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/build.properties
index 7937a444b64..0ca0ad95adc 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/build.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/build.properties
@@ -1,9 +1,8 @@
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               plugin.pdoc,\
                OSGI-INF/,\
                about.html
-src.includes = about.html
+src.includes = about.html
 source..=src
 output..=bin
 \ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/plugin.pdoc b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/plugin.pdoc
deleted file mode 100644
index 91cf0769e67..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin is only used to remove GMF Menu Contributions. &#xD;&#xA;It must have another goal">
-  <referent firstName="Vincent" lastName="Lorenzo" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA-LIST"/>
-</doc:Documentation>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/plugin.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/plugin.properties
new file mode 100644
index 00000000000..4b56f044955
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+# Copyright (c) 2015 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
+##################################################################################)
+
+pluginDescription=This plugin is only used to remove GMF Menu Contributions. It must have another goal
+\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/META-INF/MANIFEST.MF
index 81ee7a728b5..38559ff8188 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/META-INF/MANIFEST.MF
@@ -24,4 +24,4 @@ Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.menu.Activator
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.menu;singleton:=true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
+Bundle-Description: %pluginDescription
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/build.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/build.properties
index 3b1a0489a19..e2c0717c603 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/build.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/build.properties
@@ -1,10 +1,9 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               OSGI-INF/,\
-               about.html,\
-               icons/,\
-               plugin.pdoc
-src.includes = about.html
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               OSGI-INF/,\
+               about.html,\
+               icons/
+src.includes = about.html
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/plugin.pdoc b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/plugin.pdoc
deleted file mode 100644
index 80c51623b33..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides handlers for actions done on GMF Diagram (without dependencies on UML)">
-  <referent firstName="vincent" lastName="lorenzo" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA-LIST"/>
-</doc:Documentation>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/plugin.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/plugin.properties
new file mode 100644
index 00000000000..b2c822ef806
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+# Copyright (c) 2015 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
+##################################################################################)
+
+pluginDescription=This plugin provides handlers for actions done on GMF Diagram (without dependencies on UML)
+\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/META-INF/MANIFEST.MF
index 3a7eb6c7432..3d848e59dc1 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/META-INF/MANIFEST.MF
@@ -36,4 +36,4 @@ Import-Package: org.eclipse.papyrus.emf.facet.custom.ui
 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.modelexplorer;s
  ingleton:=true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
+Bundle-Description: %pluginDescription
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/build.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/build.properties
index 5c98cced39a..b5cce154e30 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/build.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/build.properties
@@ -1,10 +1,9 @@
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               plugin.properties,\
-               about.html,\
-               resources/
-source.. = src/
-src.includes = about.html,\
-               documentation.pdoc
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               plugin.properties,\
+               about.html,\
+               resources/
+source.. = src/
+src.includes = about.html
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/documentation.pdoc b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/documentation.pdoc
deleted file mode 100644
index 4226cb3a317..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/documentation.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides : &#xD;&#xA;&#x9;- the facets and the customization to display the GMF Diagrams in the ModelExplorer">
-  <referent firstName="Vincent" lastName="Lorenzo" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA-LIST"/>
-</doc:Documentation>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/plugin.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/plugin.properties
index 2744a592aa1..1e6134562bd 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/plugin.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/plugin.properties
@@ -1,3 +1,4 @@
-#Properties file for org.eclipse.papyrus.infra.gmfdiag.modelexplorer
-providerName = Eclipse Modeling Project
-pluginName = Modelexplorer for Diagrams
-\ No newline at end of file
+#Properties file for org.eclipse.papyrus.infra.gmfdiag.modelexplorer
+providerName = Eclipse Modeling Project
+pluginName = Modelexplorer for Diagrams
+pluginDescription=This plugin provides : - the facets and the customization to display the GMF Diagrams in the ModelExplorer
+\ No newline at end of file
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 72f2b564557..40ff432ce8e 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
@@ -34,4 +34,4 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.properties;sing
  leton:=true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
+Bundle-Description: %pluginDescription
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/gmf-properties.pdoc b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/gmf-properties.pdoc
deleted file mode 100644
index 1e8a0868249..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/gmf-properties.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plug-in contains the GMF property view configuration.&#xD;&#xA;&#xD;&#xA;It represents the GMF &quot;notation&quot; metamodel, and displays the &quot;Appearance&quot; tab.">
-  <referent firstName="Camille" lastName="Letavernier" eMail="camille.letavernier@cea.fr" currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/plugin.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/plugin.properties
index 9fc1c41a754..8ef52e2653b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/plugin.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/plugin.properties
@@ -1,3 +1,4 @@
-#Properties file for org.eclipse.papyrus.infra.gmfdiag.properties
-Bundle-Vendor = Eclipse Modeling Project
-Bundle-Name = Appearance properties
-\ No newline at end of file
+#Properties file for org.eclipse.papyrus.infra.gmfdiag.properties
+Bundle-Vendor = Eclipse Modeling Project
+Bundle-Name = Appearance properties
+pluginDescription=This plug-in contains the GMF property view configuration. It represents the GMF notation metamodel, and displays the Appearance tab.
+\ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/META-INF/MANIFEST.MF
index c1ff5eadf5f..58fd8711008 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/META-INF/MANIFEST.MF
@@ -20,4 +20,4 @@ Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.widgets;singlet
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.papyrus.infra.gmfdiag.widgets,
  org.eclipse.papyrus.infra.gmfdiag.widgets.editors
-
+Bundle-Description: %pluginDescription
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/gmf-widgets.pdoc b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/gmf-widgets.pdoc
deleted file mode 100644
index 650af7c61b9..00000000000
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/gmf-widgets.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plug-in contains the GMF-specific property editors, which can be used either in the property view or any other SWT UI.">
-  <referent firstName="Camille" lastName="Letavernier" eMail="camille.letavernier@cea.fr" currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/plugin.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/plugin.properties
index 4dd30f2a399..c4a2082f055 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/plugin.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/plugin.properties
@@ -1,3 +1,4 @@
 #Properties file for org.eclipse.papyrus.infra.gmfdiag.widgets
 Bundle-Vendor = Eclipse Modeling Project
-Bundle-Name = GMF Widgets
-\ No newline at end of file
+Bundle-Name = GMF Widgets
+pluginDescription=This plug-in contains the GMF-specific property editors, which can be used either in the property view or any other SWT UI.
+\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/META-INF/MANIFEST.MF
index f3c09c026d1..de06adb48e1 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/META-INF/MANIFEST.MF
@@ -38,4 +38,4 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.infra.emf.nattable;singleton:
  =true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-
+Bundle-Description: %pluginDescription
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/plugin.pdoc b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/plugin.pdoc
deleted file mode 100644
index 58d0d3e5769..00000000000
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides the EMF celleditors for the papyrus nattable widget">
-  <referent firstName="Vincent" lastName="LORENZO" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/plugin.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/plugin.properties
new file mode 100644
index 00000000000..5e41e7f98d0
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.emf.nattable/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+# Copyright (c) 2015 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
+##################################################################################)
+
+pluginDescription=This plugin provides the EMF celleditors for the papyrus nattable widget
+\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF
index 2d0a0386ac0..1aa1b1760a6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/META-INF/MANIFEST.MF
@@ -25,4 +25,4 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.controlmode;si
  ngleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-
+Bundle-Description: %pluginDescription
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/build.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/build.properties
index c053228af5a..d16b1200471 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/build.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/build.properties
@@ -5,6 +5,5 @@ bin.includes = META-INF/,\
                plugin.xml,\
                build.properties,\
                OSGI-INF/,\
-               plugin.pdoc,\
                about.html
 src.includes = about.html
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/plugin.pdoc b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/plugin.pdoc
deleted file mode 100644
index b39e2bcf7aa..00000000000
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides : &#xD;&#xA;&#x9;-A contribution to the control mode extension point to deal specifically with Papyrus tables.&#xD;&#xA;&#x9;-A handler for the Control command.&#xD;&#xA;&#x9;-A handler for the Uncontrol command.">
-  <referent firstName="Juan" lastName="Cadavid" eMail="juan.cadavid@cea.fr" currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/plugin.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/plugin.properties
new file mode 100644
index 00000000000..60614942fa7
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.controlmode/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+# Copyright (c) 2015 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
+##################################################################################)
+
+pluginDescription=This plugin provides : -A contribution to the control mode extension point to deal specifically with Papyrus tables. -A handler for the Control command.-A handler for the Uncontrol command.
+\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.doc/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.doc/META-INF/MANIFEST.MF
index ea87c0ecdc6..90f3c54ca69 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.doc/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.doc/META-INF/MANIFEST.MF
@@ -4,4 +4,4 @@ Bundle-Version: 1.1.0.qualifier
 Bundle-Name: Papyrus Table Documentation
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.doc
-
+Bundle-Description: %pluginDescription
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.doc/build.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.doc/build.properties
index 31fc0a4172a..7c204388500 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.doc/build.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.doc/build.properties
@@ -1,5 +1,4 @@
 bin.includes = META-INF/,\
                about.html,\
                tablemetamodeldocumentation.mediawiki,\
-               plugin.pdoc
 src.includes = about.html
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.doc/plugin.pdoc b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.doc/plugin.pdoc
deleted file mode 100644
index 0c39ddfbfbd..00000000000
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.doc/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides the documentation for the Papyrus Table (the new version of the Papyrus Table).">
-  <referent firstName="Vincent" lastName="LORENZO" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.doc/plugin.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.doc/plugin.properties
new file mode 100644
index 00000000000..37734d357e4
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.doc/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+# Copyright (c) 2015 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
+##################################################################################)
+
+pluginDescription=This plugin provides the documentation for the Papyrus Table (the new version of the Papyrus Table).
+\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/META-INF/MANIFEST.MF
index 6d0ae121111..6032c495d66 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/META-INF/MANIFEST.MF
@@ -26,4 +26,4 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.model.edit;sin
  gleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-
+Bundle-Description: %pluginDescription
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/plugin.pdoc b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/plugin.pdoc
deleted file mode 100644
index 3efa63544f3..00000000000
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides the metamodel used by the nattable editor.">
-  <referent firstName="Vincent" lastName="LORENZO" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/plugin.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/plugin.properties
index 67a92f84239..a95842cb39d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/plugin.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.edit/plugin.properties
@@ -217,7 +217,10 @@ _UI_TreeFillingConfiguration_pasteConfiguration_feature = Paste Configuration
 _UI_TreeFillingConfiguration_depth_feature = Depth
 _UI_TreeFillingConfiguration_labelProvider_feature = Label Provider
 _UI_TreeFillingConfiguration_labelProviderContext_feature = Label Provider Context
+
 _UI_EObjectValueStyle_type = EObject Value Style
 _UI_EObjectListValueStyle_type = EObject List Value Style
 _UI_EObjectValueStyle_eObjectValue_feature = EObject Value
 _UI_EObjectListValueStyle_eObjectValue_feature = EObject Value
+
+pluginDescription=This plugin provides the metamodel used by the nattable editor.
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/META-INF/MANIFEST.MF
index eed9287a18b..d6ba2a81633 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/META-INF/MANIFEST.MF
@@ -28,4 +28,4 @@ Bundle-Activator: org.eclipse.papyrus.infra.nattable.model.nattable.presentation
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.model.editor;singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-
+Bundle-Description: %pluginDescription
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/plugin.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/plugin.properties
index 1355b9c971a..8b33390c220 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/plugin.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor/plugin.properties
@@ -141,3 +141,5 @@ _UI_Wizard_initial_object_description = Select a model object to create
 _UI_FileConflict_label = File Conflict
 _WARN_FileConflict = There are unsaved changes that conflict with changes made outside the editor.  Do you wish to discard this editor's changes?
 
+
+pluginDescription=This plugin provides the editor to create table configuration.
+\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/META-INF/MANIFEST.MF
index 5c3ba54926b..d58d05b98cd 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/META-INF/MANIFEST.MF
@@ -45,4 +45,4 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.model;singleto
  n:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-
+Bundle-Description: %pluginDescription
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/plugin.pdoc b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/plugin.pdoc
deleted file mode 100644
index 3efa63544f3..00000000000
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides the metamodel used by the nattable editor.">
-  <referent firstName="Vincent" lastName="LORENZO" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/plugin.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/plugin.properties
index 7ef261d521b..6846e6c58e6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/plugin.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/plugin.properties
@@ -11,3 +11,5 @@
 
 pluginName = Papyrus Nattable Model
 providerName = Eclipse Modeling Project
+
+pluginDescription=This plugin provides the metamodel used by the nattable editor.
+\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/META-INF/MANIFEST.MF
index 213eeed5322..b500859fb49 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/META-INF/MANIFEST.MF
@@ -37,4 +37,4 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.modelexplorer;
  singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-
+Bundle-Description: %pluginDescription
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/build.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/build.properties
index af08ccbab2b..cc9e87ccda5 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/build.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/build.properties
@@ -5,6 +5,5 @@ bin.includes = META-INF/,\
                plugin.xml,\
                about.html,\
                resources/,\
-               plugin.pdoc,\
                OSGI-INF/
 src.includes = about.html
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/plugin.pdoc b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/plugin.pdoc
deleted file mode 100644
index 081f9a207f6..00000000000
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides : &#xD;&#xA;&#x9;- the facets and the customization to display the Papyrus Nattables in the ModelExplorer">
-  <referent firstName="Juan" lastName="Cadavid" eMail="juan.cadavid@cea.fr" currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/plugin.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/plugin.properties
new file mode 100644
index 00000000000..8a86962e6af
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+# Copyright (c) 2015 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
+##################################################################################)
+
+pluginDescription=This plugin provides : - the facets and the customization to display the Papyrus Nattables in the ModelExplorer
+\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF
index e129c885373..9bcaf74113e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF
@@ -34,4 +34,4 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.properties;sin
  gleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-
+Bundle-Description: %pluginDescription
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/build.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/build.properties
index 3cb690af3db..5399ff976dc 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/build.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/build.properties
@@ -5,6 +5,5 @@ bin.includes = META-INF/,\
                plugin.xml,\
                about.html,\
                OSGI-INF/,\
-               plugin.pdoc,\
                model/
 src.includes = about.html
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/plugin.pdoc b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/plugin.pdoc
deleted file mode 100644
index b47a13683a4..00000000000
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides the property views for the Papyrus NatTable widget">
-  <referent firstName="vincent" lastName="lorenzo" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA-LIST"/>
-</doc:Documentation>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/plugin.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/plugin.properties
new file mode 100644
index 00000000000..7fc1a35bcaa
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+# Copyright (c) 2015 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
+##################################################################################)
+
+pluginDescription=This plugin provides the property views for the Papyrus NatTable widget
+\ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF
index 104ac803b13..427322d4195 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF
@@ -76,4 +76,4 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable;singleton:=tru
  e
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-
+Bundle-Description: %pluginDescription
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/build.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/build.properties
index 0444389db8a..15fddf58ac6 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/build.properties
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/build.properties
@@ -5,7 +5,6 @@ bin.includes = META-INF/,\
                plugin.xml,\
                icons/,\
                about.html,\
-               plugin.pdoc,\
                OSGI-INF/,\
                schema/
 src.includes = about.html
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/plugin.pdoc b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/plugin.pdoc
deleted file mode 100644
index 95c3e133726..00000000000
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides the common classes for the Papyrus nattable editor">
-  <referent firstName="Vincent" lastName="LORENZO" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/plugin.properties b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/plugin.properties
new file mode 100644
index 00000000000..d68bcb9feda
--- /dev/null
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+# Copyright (c) 2015 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
+##################################################################################)
+
+pluginDescription=This plugin provides the common classes for the Papyrus nattable editor
+\ No newline at end of file
diff --git a/plugins/infra/org.eclipse.papyrus.infra.doc/build.properties b/plugins/infra/org.eclipse.papyrus.infra.doc/build.properties
index bc36f4ab280..3b3a621cf02 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.doc/build.properties
+++ b/plugins/infra/org.eclipse.papyrus.infra.doc/build.properties
@@ -1,9 +1,8 @@
-bin.includes = META-INF/,\
-               plugin.xml,\
-               OSGI-INF/,\
-               intro/,\
-               plugin.pdoc,\
-               toc.xml,\
-               about.html,\
-               resource/
+bin.includes = META-INF/,\
+               plugin.xml,\
+               OSGI-INF/,\
+               intro/,\
+               toc.xml,\
+               about.html,\
+               resource/
 src.includes = about.html
diff --git a/plugins/infra/org.eclipse.papyrus.infra.doc/plugin.pdoc b/plugins/infra/org.eclipse.papyrus.infra.doc/plugin.pdoc
deleted file mode 100644
index 93b94c2906a..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.doc/plugin.pdoc
+++ /dev/null
@@ -1,3 +0,0 @@
-Infrastructure plugin for documentation.
-It describes all the main entry points (anchors) for the documentation plugins provided by Papyrus.
-It also describes the intro extension for the Eclipse platform
-\ No newline at end of file
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.infra.hyperlink/META-INF/MANIFEST.MF
index 0f217d68b8e..dd78b5673b1 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/META-INF/MANIFEST.MF
+++ b/plugins/infra/org.eclipse.papyrus.infra.hyperlink/META-INF/MANIFEST.MF
@@ -33,4 +33,4 @@ Bundle-Activator: org.eclipse.papyrus.infra.hyperlink.Activator
 Bundle-SymbolicName: org.eclipse.papyrus.infra.hyperlink;singleton:=tr
  ue
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
+Bundle-Description: %pluginDescription
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/build.properties b/plugins/infra/org.eclipse.papyrus.infra.hyperlink/build.properties
index 523f2bd52df..f210587952a 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/build.properties
+++ b/plugins/infra/org.eclipse.papyrus.infra.hyperlink/build.properties
@@ -4,7 +4,6 @@ bin.includes = META-INF/,\
                .,\
                schema/,\
                about.html,\
-               plugin.pdoc,\
                plugin.xml,\
                build.properties,\
                plugin.properties
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/plugin.pdoc b/plugins/infra/org.eclipse.papyrus.infra.hyperlink/plugin.pdoc
deleted file mode 100644
index 9f60afc4f3b..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/plugin.pdoc
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides the dialog and the commands to add hyperlinks on an object.&#xD;&#xA;This plugin should not have dependencies on uml, gmf.notation.* and tables.">
-  <referent firstName="vincent" lastName="lorenzo" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA-LIST"/>
-  <referent firstName="patrick" lastName="tessier" eMail="patrick.tessier@cea.fr" currentCompany="CEA-LIST"/>
-</doc:Documentation>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/plugin.properties b/plugins/infra/org.eclipse.papyrus.infra.hyperlink/plugin.properties
index 4cff51346fc..dfea23767cb 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.hyperlink/plugin.properties
+++ b/plugins/infra/org.eclipse.papyrus.infra.hyperlink/plugin.properties
@@ -1,4 +1,5 @@
-#Properties file for org.eclipse.papyrus.infra.hyperlink
-providerName = Eclipse Modeling Project
-pluginName = Papyrus Hyperlink
-extension-point.name = org.eclipse.papyrus.infra.hyperlink.registration
-\ No newline at end of file
+#Properties file for org.eclipse.papyrus.infra.hyperlink
+providerName = Eclipse Modeling Project
+pluginName = Papyrus Hyperlink
+extension-point.name = org.eclipse.papyrus.infra.hyperlink.registration
+pluginDescription=This plugin provides the dialog and the commands to add hyperlinks on an object. This plugin should not have dependencies on uml, gmf.notation.* and tables.
+\ No newline at end of file
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/META-INF/MANIFEST.MF
index 8fdd3415cc1..f6dd4876b19 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/META-INF/MANIFEST.MF
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/META-INF/MANIFEST.MF
@@ -18,4 +18,4 @@ Bundle-Activator: org.eclipse.papyrus.infra.newchild.elementcreationme
 Bundle-SymbolicName: org.eclipse.papyrus.infra.newchild.edit;singleton
  :=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-
+Bundle-Description: %pluginDescription
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/build.properties b/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/build.properties
index 0c2484725a0..48875dbc32f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/build.properties
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/build.properties
@@ -18,5 +18,4 @@ bin.includes = .,\
 jars.compile.order = .
 source.. = src-gen/
 output.. = bin/
-src.includes = plugin.pdoc,\
                about.html
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/plugin.pdoc b/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/plugin.pdoc
deleted file mode 100644
index ce8693515b6..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="The pupose of this plugin is to offer the model and means to create new menu in the model explorer.&#xD;&#xA;More documentation (models and file.doc) has been store in the docs directory&#xD;&#xA;The plugin in harget to do the connection with the model explorer is org.eclipse.papyrus.view.modelexplorer.newchild">
-  <referent firstName="Patrick" lastName="Tessier" eMail="patrick.tessier@cea.fr" currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/plugin.properties b/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/plugin.properties
index c35a2d34ad7..b12afdd87b7 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/plugin.properties
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild.edit/plugin.properties
@@ -37,3 +37,5 @@ _UI_CreationMenu_displayAllRoles_feature = Display All Roles
 _UI_Unknown_feature = Unspecified
 
 _UI_Menu_visible_feature = Visible
+
+pluginDescription=The pupose of this plugin is to offer the model and means to create new menu in the model explorer.&#xD;&#xA;More documentation (models and file.doc) has been store in the docs directory The plugin in harget to do the connection with the model explorer is org.eclipse.papyrus.view.modelexplorer.newchild
+\ No newline at end of file
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.infra.newchild/META-INF/MANIFEST.MF
index afb9b97724f..52af6c76872 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/META-INF/MANIFEST.MF
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/META-INF/MANIFEST.MF
@@ -36,4 +36,4 @@ Bundle-Description: The purpose of this plugin is to offer the model a
 Bundle-SymbolicName: org.eclipse.papyrus.infra.newchild;singleton:=tru
  e
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
+Bundle-Description: %pluginDescription
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/build.properties b/plugins/infra/org.eclipse.papyrus.infra.newchild/build.properties
index 602f041fcce..85abf2cc868 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/build.properties
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/build.properties
@@ -10,8 +10,7 @@ bin.includes = META-INF/,\
                resource/
 src.includes = about.html,\
                schema/,\
-               docs/,\
-               plugin.pdoc
+               docs/
 jre.compilation.profile = J2SE-1.5
 bin.excludes = docs/ElementCreationMenuModel.di,\
                docs/ElementCreationMenuModel.notation,\
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/plugin.pdoc b/plugins/infra/org.eclipse.papyrus.infra.newchild/plugin.pdoc
deleted file mode 100644
index bb5c8428fd9..00000000000
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="The pupose of this plugin is to offer the model and means to create new menu in the model explorer.&#xD;&#xA;More documentation (models and file.doc) has been store in the docs directory&#xD;&#xA;The plugin in harget to do the connection with the model explorer is org.eclipse.papyrus.view.modelexplorer.newchild">
-  <referent firstName="Patrick" lastName="Tessier" eMail="patrick.tessier@cea.fr" currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.newchild/plugin.properties b/plugins/infra/org.eclipse.papyrus.infra.newchild/plugin.properties
index d58e28089af..8b1b34f0f4d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.newchild/plugin.properties
+++ b/plugins/infra/org.eclipse.papyrus.infra.newchild/plugin.properties
@@ -1,12 +1,14 @@
-#################################################################################
-# Copyright (c) 2013 CEA LIST
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     Patrick Tessier (CEA LIST) - Initial API and implementation
-##################################################################################
-pluginName=Papyrus infra new child
-providerName=Eclipse Modeling Project
+#################################################################################
+# Copyright (c) 2013 CEA LIST
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Patrick Tessier (CEA LIST) - Initial API and implementation
+##################################################################################
+pluginName=Papyrus infra new child
+providerName=Eclipse Modeling Project
+
+pluginDescription=The pupose of this plugin is to offer the model and means to create new menu in the model explorer.&#xD;&#xA;More documentation (models and file.doc) has been store in the docs directory The plugin in harget to do the connection with the model explorer is org.eclipse.papyrus.view.modelexplorer.newchild
+\ No newline at end of file
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/build.properties b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/build.properties
index 03f803722fc..a491a4cb7bd 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/build.properties
+++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/build.properties
@@ -1,7 +1,7 @@
-#
-#Mon Sep 12 09:30:21 CEST 2011
-bin.includes=META-INF/,.,plugin.properties,plugin.xml,about.html,icons/,schema/
-output..=bin/
-src.includes = about.html
-source..=src/
-bin..=bin/
+#
+#Mon Sep 12 09:30:21 CEST 2011
+bin.includes=META-INF/,.,plugin.properties,plugin.xml,about.html,icons/,schema/
+output..=bin/
+src.includes=schema/,about.html,META-INF/,.,plugin.properties,plugin.xml,icons/
+source..=src/
+bin..=bin/
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF
index 9be21644fe5..aba0d207ccc 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF
+++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF
@@ -35,4 +35,4 @@ Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.infra.widgets.Activator
 Bundle-SymbolicName: org.eclipse.papyrus.infra.widgets;singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-
+Bundle-Description: %pluginDescription
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/build.properties b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/build.properties
index fedd0b7b4da..8080cf00176 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/build.properties
+++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/build.properties
@@ -1,13 +1,12 @@
-#
-#Mon Sep 12 09:30:25 CEST 2011
-bin.includes = META-INF/,\
-               .,\
-               icons/,\
-               plugin.properties,\
-               about.html,\
-               plugin.xml
-output..=bin/
-src.includes = about.html,\
-               widgets.pdoc
-source..=src/
-bin..=bin/
+#
+#Mon Sep 12 09:30:25 CEST 2011
+bin.includes = META-INF/,\
+               .,\
+               icons/,\
+               plugin.properties,\
+               about.html,\
+               plugin.xml
+output..=bin/
+src.includes = about.html
+source..=src/
+bin..=bin/
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/plugin.properties b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/plugin.properties
index 9a53fcc5572..a566c99ea30 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/plugin.properties
+++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/plugin.properties
@@ -1,12 +1,13 @@
-#################################################################################
-# Copyright (c) 2010 CEA LIST.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - initial API and implementation
-##################################################################################
-providerName = Eclipse Modeling Project
-pluginName = Papyrus widgets
-\ No newline at end of file
+#################################################################################
+# Copyright (c) 2010 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - initial API and implementation
+##################################################################################
+providerName = Eclipse Modeling Project
+pluginName = Papyrus widgets
+pluginDescription=This plug-in contains a set of SWT widgets for editing different kind of elements. These widgets should be used as a standard in Papyrus. Most of them can be used in two different ways: - Eclipse Databinding - setValue/getValue
+\ No newline at end of file
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/widgets.pdoc b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/widgets.pdoc
deleted file mode 100644
index 488da0c1506..00000000000
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/widgets.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plug-in contains a set of SWT widgets for editing different kind of elements.&#xD;&#xA;&#xD;&#xA;These widgets should be used as a standard in Papyrus. Most of them can be used in two different ways:&#xD;&#xA;&#xD;&#xA;- Eclipse Databinding&#xD;&#xA;- setValue/getValue">
-  <referent firstName="Camille" lastName="Letavernier" eMail="camille.letavernier@cea.fr" currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/META-INF/MANIFEST.MF b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/META-INF/MANIFEST.MF
index cf1e0963324..cc94ebeaf69 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/META-INF/MANIFEST.MF
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/META-INF/MANIFEST.MF
@@ -28,4 +28,4 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.sysml.nattable.menu;singleton
  :=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-
+Bundle-Description: %pluginDescription
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/build.properties b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/build.properties
index 93fc8fd5237..8b230b23b15 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/build.properties
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/build.properties
@@ -5,6 +5,5 @@ bin.includes = META-INF/,\
                .,\
                plugin.xml,\
                about.html,\
-               plugin.pdoc,\
                OSGI-INF/
 src.includes = about.html
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/plugin.pdoc b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/plugin.pdoc
deleted file mode 100644
index 5e34df8f759..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides the context menu for the tabular editor in SysML, with handlers for the creation of SysML model elements">
-  <referent firstName="Juan" lastName="Cadavid" eMail="juan.cadavid@cea.fr" currentCompany="CEA-LIST"/>
-</doc:Documentation>
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/plugin.properties b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/plugin.properties
new file mode 100644
index 00000000000..69523a809d3
--- /dev/null
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.menu/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+# Copyright (c) 2015 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
+##################################################################################)
+
+pluginDescription=This plugin provides the context menu for the tabular editor in SysML, with handlers for the creation of SysML model elements
+\ No newline at end of file
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/META-INF/MANIFEST.MF b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/META-INF/MANIFEST.MF
index 5418873575a..8d6cca01bfe 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/META-INF/MANIFEST.MF
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/META-INF/MANIFEST.MF
@@ -21,4 +21,4 @@ Bundle-SymbolicName: org.eclipse.papyrus.sysml.nattable.requirement.co
  nfig;singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.papyrus.sysml.nattable.requirement.config
-
+Bundle-Description: %pluginDescription
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/build.properties b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/build.properties
index 179cd667297..e9f93383ebb 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/build.properties
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/build.properties
@@ -6,6 +6,5 @@ bin.includes = META-INF/,\
                OSGI-INF/,\
                configs/,\
                icons/,\
-               plugin.pdoc,\
                about.html
 src.includes = about.html
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/plugin.pdoc b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/plugin.pdoc
deleted file mode 100644
index dfb917b2aee..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides the configuration to use for Requirement Table.">
-  <referent firstName="Vincent" lastName="LORENZO" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/plugin.properties b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/plugin.properties
new file mode 100644
index 00000000000..f4c3f32fc68
--- /dev/null
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.config/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+# Copyright (c) 2015 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
+##################################################################################)
+
+pluginDescription=This plugin provides the configuration to use for Requirement Table.
+\ No newline at end of file
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/META-INF/MANIFEST.MF b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/META-INF/MANIFEST.MF
index 3a6af60cf6e..a53fa88d01b 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/META-INF/MANIFEST.MF
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/META-INF/MANIFEST.MF
@@ -23,4 +23,4 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.sysml.nattable.requirement;si
  ngleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-
+Bundle-Description: %pluginDescription
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/build.properties b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/build.properties
index 969846320ef..73e2dede47b 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/build.properties
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/build.properties
@@ -3,7 +3,6 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               plugin.pdoc,\
                about.html,\
                OSGI-INF/,\
                icons/
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/plugin.pdoc b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/plugin.pdoc
deleted file mode 100644
index 42a2e94d98d..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides the nattable editor for SysML Requirements.">
-  <referent firstName="Vincent" lastName="LORENZO" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/plugin.properties b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/plugin.properties
new file mode 100644
index 00000000000..8895526e182
--- /dev/null
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+# Copyright (c) 2015 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
+##################################################################################)
+
+pluginDescription=This plugin provides the nattable editor for SysML Requirements.
+\ No newline at end of file
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/META-INF/MANIFEST.MF b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/META-INF/MANIFEST.MF
index e3797e7a7e2..ba84e8a8079 100644
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/META-INF/MANIFEST.MF
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/META-INF/MANIFEST.MF
@@ -28,4 +28,4 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.sysml.nattable;singleton:=tru
  e
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-
+Bundle-Description: %pluginDescription
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/plugin.pdoc b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/plugin.pdoc
deleted file mode 100644
index a492b48727b..00000000000
--- a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides common classes for the sysml nattable.">
-  <referent firstName="Vincent" lastName="LORENZO" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/plugin.properties b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/plugin.properties
new file mode 100644
index 00000000000..37d84869cb4
--- /dev/null
+++ b/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+# Copyright (c) 2015 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
+##################################################################################)
+
+pluginDescription=This plugin provides common classes for the sysml nattable.
+\ No newline at end of file
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/META-INF/MANIFEST.MF b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/META-INF/MANIFEST.MF
index 2ef892d8672..1e54eca5169 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/META-INF/MANIFEST.MF
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/META-INF/MANIFEST.MF
@@ -12,4 +12,4 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.sysml.properties;singleton:=t
  rue
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
+Bundle-Description: %pluginDescription
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/plugin.properties b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/plugin.properties
new file mode 100644
index 00000000000..aea07946faf
--- /dev/null
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+# Copyright (c) 2015 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
+##################################################################################)
+
+pluginDescription=This plug-in contains the SysML property view configuration
+\ No newline at end of file
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/sysml-properties.pdoc b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/sysml-properties.pdoc
deleted file mode 100644
index 71eefda68a1..00000000000
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/sysml-properties.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plug-in contains the SysML property view configuration">
-  <referent firstName="Camille" lastName="Letavernier" eMail="camille.letavernier@cea.fr" currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/META-INF/MANIFEST.MF b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/META-INF/MANIFEST.MF
index bd31b94d679..0e97f2b4de1 100644
--- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/META-INF/MANIFEST.MF
+++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/META-INF/MANIFEST.MF
@@ -1,6 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
+Bundle-Description: %pluginDescription
 Bundle-SymbolicName: org.eclipse.papyrus.uml.decoratormodel.controlmode;singleton:=true
 Bundle-Version: 1.1.0.qualifier
 Bundle-ClassPath: .
diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/build.properties b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/build.properties
index ec9cbd2972b..092e2d68eb9 100644
--- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/build.properties
+++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/build.properties
@@ -3,7 +3,6 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                about.html,\
-               documentation.pdoc,\
                plugin.xml,\
                plugin.properties
 src.includes = about.html
diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/documentation.pdoc b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/documentation.pdoc
deleted file mode 100644
index 9c2acff120a..00000000000
--- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/documentation.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="Control-mode participants for management of externalized profile applications.">
-  <referent firstName="Christian" lastName="Damus" eMail="give.a.damus@gmail.com" currentCompany="independent"/>
-</doc:Documentation>
diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/plugin.properties b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/plugin.properties
index a1a12f40362..cc00daa013e 100644
--- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/plugin.properties
+++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.controlmode/plugin.properties
@@ -10,3 +10,5 @@
 
 pluginName = Papyrus Decorator Models Control Mode Extensions
 providerName = Eclipse Modeling Project
+
+pluginDescription=Control-mode participants for management of externalized profile applications.
+\ No newline at end of file
diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/META-INF/MANIFEST.MF b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/META-INF/MANIFEST.MF
index c5182577e79..36b9da8b1e8 100644
--- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/META-INF/MANIFEST.MF
+++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/META-INF/MANIFEST.MF
@@ -1,6 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
+Bundle-Description: %pluginDescription
 Bundle-SymbolicName: org.eclipse.papyrus.uml.decoratormodel.properties;singleton:=true
 Bundle-Version: 1.1.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.uml.decoratormodel.properties.Activator
diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/build.properties b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/build.properties
index b95c74127cb..a83114e1e5f 100644
--- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/build.properties
+++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/build.properties
@@ -6,6 +6,5 @@ bin.includes = META-INF/,\
                resources/,\
                OSGI-INF/,\
                icons/,\
-               about.html,\
-               documentation.pdoc
+               about.html
 src.includes = about.html
diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/documentation.pdoc b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/documentation.pdoc
deleted file mode 100644
index 53d668be2bb..00000000000
--- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/documentation.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="Property sheet customizations for management of separate profile applications.">
-  <referent firstName="Christian" lastName="Damus" eMail="give.a.damus@gmail.com" currentCompany="independent"/>
-</doc:Documentation>
diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/plugin.properties b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/plugin.properties
new file mode 100644
index 00000000000..cb6129bd7e0
--- /dev/null
+++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+# Copyright (c) 2015 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
+##################################################################################)
+
+pluginDescription=Property sheet customizations for management of separate profile applications.
+\ No newline at end of file
diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/META-INF/MANIFEST.MF b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/META-INF/MANIFEST.MF
index 55c1d331102..df7adb9110c 100644
--- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/META-INF/MANIFEST.MF
+++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/META-INF/MANIFEST.MF
@@ -1,6 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
+Bundle-Description: %pluginDescription
 Bundle-SymbolicName: org.eclipse.papyrus.uml.decoratormodel.ui;singleton:=true
 Bundle-Version: 1.1.0.qualifier
 Bundle-ClassPath: .
diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/build.properties b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/build.properties
index 169989da1b8..a005a482cc3 100644
--- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/build.properties
+++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/build.properties
@@ -3,7 +3,6 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                about.html,\
-               documentation.pdoc,\
                plugin.xml,\
                plugin.properties,\
                icons/
diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/documentation.pdoc b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/documentation.pdoc
deleted file mode 100644
index 4887381972c..00000000000
--- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/documentation.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="User interface elements for management of separate profile applications.">
-  <referent firstName="Christian" lastName="Damus" eMail="give.a.damus@gmail.com" currentCompany="independent"/>
-</doc:Documentation>
diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/plugin.properties b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/plugin.properties
index b82480134b3..030d0409534 100644
--- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/plugin.properties
+++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/plugin.properties
@@ -36,3 +36,5 @@ cnf.filter.name = Profile Applications
 profapps.decorator.label = Profile Applications
 profapps.decorator.description = Indicates workspace resources that are profile applications and packages in Model Explorer for which there are unloaded profile applications available that apply profiles to them.
 profapps.page.name = Profile Applications
+
+pluginDescription=User interface elements for management of separate profile applications.
+\ No newline at end of file
diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/META-INF/MANIFEST.MF b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/META-INF/MANIFEST.MF
index c4b13432a13..f962767400e 100644
--- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/META-INF/MANIFEST.MF
+++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/META-INF/MANIFEST.MF
@@ -1,6 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
+Bundle-Description: %pluginDescription
 Bundle-SymbolicName: org.eclipse.papyrus.uml.decoratormodel;singleton:=true
 Bundle-Version: 1.1.0.qualifier
 Bundle-ClassPath: .
diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/build.properties b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/build.properties
index 59720444625..0bd08ce450f 100644
--- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/build.properties
+++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/build.properties
@@ -4,7 +4,6 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                about.html,\
-               documentation.pdoc,\
                plugin.xml,\
                model/profileExternalization.ecore,\
                model/ProfileExternalization.profile.uml,\
diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/documentation.pdoc b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/documentation.pdoc
deleted file mode 100644
index a9948960562..00000000000
--- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/documentation.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="Core APIs for management of profile and stereotype applications in external resources">
-  <referent firstName="Christian" lastName="Damus" eMail="give.a.damus@gmail.com" currentCompany="independent"/>
-</doc:Documentation>
diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/plugin.properties b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/plugin.properties
index b7baf78fbf7..f9f6ab9c867 100644
--- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/plugin.properties
+++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel/plugin.properties
@@ -12,3 +12,5 @@ pluginName = Papyrus Decorator Models Core
 providerName = Eclipse Modeling Project
 
 content-type.name = Papyrus Profile Application
+
+pluginDescription=Core APIs for management of profile and stereotype applications in external resources
+\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF
index 12998c28a49..0b7d4500b02 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF
@@ -1,94 +1,95 @@
-Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.uml.diagram.clazz,
- org.eclipse.papyrus.uml.diagram.clazz.custom.action,
- org.eclipse.papyrus.uml.diagram.clazz.custom.command,
- org.eclipse.papyrus.uml.diagram.clazz.custom.edit.actions,
- org.eclipse.papyrus.uml.diagram.clazz.custom.edit.commands,
- org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part,
- org.eclipse.papyrus.uml.diagram.clazz.custom.factory,
- org.eclipse.papyrus.uml.diagram.clazz.custom.figure,
- org.eclipse.papyrus.uml.diagram.clazz.custom.helper,
- org.eclipse.papyrus.uml.diagram.clazz.custom.helper.advice,
- org.eclipse.papyrus.uml.diagram.clazz.custom.parsers,
- org.eclipse.papyrus.uml.diagram.clazz.custom.policies,
- org.eclipse.papyrus.uml.diagram.clazz.custom.providers,
- org.eclipse.papyrus.uml.diagram.clazz.custom.utils,
- org.eclipse.papyrus.uml.diagram.clazz.edit.helpers,
- org.eclipse.papyrus.uml.diagram.clazz.edit.parts,
- org.eclipse.papyrus.uml.diagram.clazz.edit.policies,
- org.eclipse.papyrus.uml.diagram.clazz.expressions,
- org.eclipse.papyrus.uml.diagram.clazz.navigator,
- org.eclipse.papyrus.uml.diagram.clazz.parsers,
- org.eclipse.papyrus.uml.diagram.clazz.part,
- org.eclipse.papyrus.uml.diagram.clazz.providers
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.expressions,
- org.eclipse.ui.navigator,
- org.eclipse.ui.navigator.resources,
- org.eclipse.gmf.runtime.diagram.ui.properties,
- org.eclipse.gmf.runtime.diagram.ui.render,
- org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide,
- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.1.0",
- org.eclipse.ocl.ecore,
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.1.0",
- org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.1.0",
- org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.3.0",
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.gmf.runtime.emf.core,
- org.eclipse.gmf.runtime.emf.commands.core,
- org.eclipse.gmf.runtime.emf.ui.properties,
- org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.gmf.runtime.diagram.ui.providers.ide,
- org.eclipse.gmf.runtime.diagram.ui.resources.editor,
- org.eclipse.uml2.uml,
- org.eclipse.gmf.runtime.draw2d.ui,
- org.eclipse.ui,
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",
- org.eclipse.papyrus.uml.service.types;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.1.0",
- org.eclipse.papyrus.uml.appearance;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
- org.eclipse.ui.ide;bundle-version="3.8.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.1.0",
- org.eclipse.uml2.uml.edit;bundle-version="4.0.0",
- org.eclipse.gmf.tooling.runtime;bundle-version="3.1.0",
- org.eclipse.jface,
- org.eclipse.ui.views,
- org.eclipse.emf.ecore,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.emf.edit.ui,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.edit;visibility:=reexport,
- org.eclipse.emf.validation;visibility:=reexport,
- org.eclipse.gef,
- org.apache.batik.dom.svg;bundle-version="[1.6.0,1.7.0)",
- org.apache.batik.util;bundle-version="[1.6.0,1.7.0)",
- org.apache.batik.svggen;bundle-version="[1.6.0,1.7.0)",
- org.apache.batik.dom;bundle-version="[1.6.0,1.7.0)",
- org.w3c.dom.svg,
- org.apache.batik.css;bundle-version="[1.6.0,1.7.0)",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.1.0",
- org.eclipse.core.databinding.observable
-Bundle-Vendor: %providerName
-Eclipse-LazyStart: true
-Bundle-Version: 1.1.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.clazz; singleton:=true
+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.diagram.clazz,
+ org.eclipse.papyrus.uml.diagram.clazz.custom.action,
+ org.eclipse.papyrus.uml.diagram.clazz.custom.command,
+ org.eclipse.papyrus.uml.diagram.clazz.custom.edit.actions,
+ org.eclipse.papyrus.uml.diagram.clazz.custom.edit.commands,
+ org.eclipse.papyrus.uml.diagram.clazz.custom.edit.part,
+ org.eclipse.papyrus.uml.diagram.clazz.custom.factory,
+ org.eclipse.papyrus.uml.diagram.clazz.custom.figure,
+ org.eclipse.papyrus.uml.diagram.clazz.custom.helper,
+ org.eclipse.papyrus.uml.diagram.clazz.custom.helper.advice,
+ org.eclipse.papyrus.uml.diagram.clazz.custom.parsers,
+ org.eclipse.papyrus.uml.diagram.clazz.custom.policies,
+ org.eclipse.papyrus.uml.diagram.clazz.custom.providers,
+ org.eclipse.papyrus.uml.diagram.clazz.custom.utils,
+ org.eclipse.papyrus.uml.diagram.clazz.edit.helpers,
+ org.eclipse.papyrus.uml.diagram.clazz.edit.parts,
+ org.eclipse.papyrus.uml.diagram.clazz.edit.policies,
+ org.eclipse.papyrus.uml.diagram.clazz.expressions,
+ org.eclipse.papyrus.uml.diagram.clazz.navigator,
+ org.eclipse.papyrus.uml.diagram.clazz.parsers,
+ org.eclipse.papyrus.uml.diagram.clazz.part,
+ org.eclipse.papyrus.uml.diagram.clazz.providers
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Name: %pluginName
+Bundle-Description: %pluginDescription
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.eclipse.core.expressions,
+ org.eclipse.ui.navigator,
+ org.eclipse.ui.navigator.resources,
+ org.eclipse.gmf.runtime.diagram.ui.properties,
+ org.eclipse.gmf.runtime.diagram.ui.render,
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide,
+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="1.1.0",
+ org.eclipse.ocl.ecore,
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.1.0",
+ org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.1.0",
+ org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.3.0",
+ org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.gmf.runtime.emf.core,
+ org.eclipse.gmf.runtime.emf.commands.core,
+ org.eclipse.gmf.runtime.emf.ui.properties,
+ org.eclipse.gmf.runtime.diagram.ui,
+ org.eclipse.gmf.runtime.diagram.ui.providers.ide,
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor,
+ org.eclipse.uml2.uml,
+ org.eclipse.gmf.runtime.draw2d.ui,
+ org.eclipse.ui,
+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.service.types;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",
+ com.google.guava;bundle-version="11.0.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.appearance;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
+ org.eclipse.ui.ide;bundle-version="3.8.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.1.0",
+ org.eclipse.uml2.uml.edit;bundle-version="4.0.0",
+ org.eclipse.gmf.tooling.runtime;bundle-version="3.1.0",
+ org.eclipse.jface,
+ org.eclipse.ui.views,
+ org.eclipse.emf.ecore,
+ org.eclipse.emf.ecore.xmi,
+ org.eclipse.emf.edit.ui,
+ org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.emf.ecore.edit;visibility:=reexport,
+ org.eclipse.emf.validation;visibility:=reexport,
+ org.eclipse.gef,
+ org.apache.batik.dom.svg;bundle-version="[1.6.0,1.7.0)",
+ org.apache.batik.util;bundle-version="[1.6.0,1.7.0)",
+ org.apache.batik.svggen;bundle-version="[1.6.0,1.7.0)",
+ org.apache.batik.dom;bundle-version="[1.6.0,1.7.0)",
+ org.w3c.dom.svg,
+ org.apache.batik.css;bundle-version="[1.6.0,1.7.0)",
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.elementtypesconfigurations;bundle-version="1.1.0",
+ org.eclipse.core.databinding.observable
+Bundle-Vendor: %providerName
+Eclipse-LazyStart: true
+Bundle-Version: 1.1.0.qualifier
+Bundle-Activator: org.eclipse.papyrus.uml.diagram.clazz.part.UMLDiagramEditorPlugin
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.clazz; singleton:=true
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/clazzDiagram.pdoc b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/clazzDiagram.pdoc
deleted file mode 100644
index 5d61b226a2b..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/clazzDiagram.pdoc
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin has in charge to represent UML element as defined for the class diagram">
-  <referent firstName="Patrick " lastName="Tessier" eMail="patrick.tessier@cea.fr" currentCompany="CEA LIST"/>
-  <additionalComments title="About Displayed elements in the class diagram" contents="This diagram can display all elements of UML, by using a default notation.&#xD;&#xA;From this diagram, you can create all element defined in the UML sepcification ( class structure chapter 7) and template structure with InformationFlow and InformationItem"/>
-</doc:Documentation>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.properties
index d76a047c8d5..93a7b449738 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/plugin.properties
@@ -160,3 +160,5 @@ metatype.name.DataType_3047=PrimitiveType
 metatype.name.DataType_3046=PrimitiveType
 metatype.name.DataType_3048=PrimitiveType
 metatype.name.ConstraintContext_8500=Undefined
+
+pluginDescription=This plugin has in charge to represent UML element as defined for the class diagram
+\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF
index c0dce0de6d4..623e0c6790e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF
@@ -37,4 +37,4 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.menu;singleton:=t
  rue
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
+Bundle-Description: %pluginDescription
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/build.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/build.properties
index 6f5ddd0023a..54392b81055 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/build.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/build.properties
@@ -1,13 +1,12 @@
-#
-#Mon Sep 12 09:29:47 CEST 2011
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               about.html,\
-               icons/,\
-               plugin.properties,\
-               plugin.pdoc
-output..=bin/
-src.includes = about.html
-source..=src/
-bin..=bin/
+#
+#Mon Sep 12 09:29:47 CEST 2011
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               about.html,\
+               icons/,\
+               plugin.properties
+output..=bin/
+src.includes = about.html
+source..=src/
+bin..=bin/
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/plugin.pdoc b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/plugin.pdoc
deleted file mode 100644
index d3d8f95e2f2..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides handlers for the actions done on UML Diagram.">
-  <referent firstName="vincent" lastName="lorenzo" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA-LIST"/>
-</doc:Documentation>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/plugin.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/plugin.properties
index c33e4128444..e9f4aabc543 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/plugin.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/plugin.properties
@@ -1,3 +1,4 @@
 #Properties file for org.eclipse.papyrus.uml.diagram.menu
 providerName=Eclipse Modeling Project
-pluginName = Papyrus Menu Diagram
-\ No newline at end of file
+pluginName = Papyrus Menu Diagram
+pluginDescription=This plugin provides handlers for the actions done on UML Diagram.
+\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/META-INF/MANIFEST.MF
index b8f63364580..9e16b983191 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/META-INF/MANIFEST.MF
@@ -30,4 +30,4 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.modelexplorer;sin
  gleton:=true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
+Bundle-Description: %pluginDescription
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/build.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/build.properties
index bd56fa1b745..28a76ebc631 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/build.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/build.properties
@@ -5,7 +5,6 @@ bin.includes = META-INF/,\
                plugin.xml,\
                about.html,\
                plugin.properties,\
-               documentation.pdoc,\
                icon/
 output..=bin/
 src.includes = about.html
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/documentation.pdoc b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/documentation.pdoc
deleted file mode 100644
index 04e83aba9e8..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/documentation.pdoc
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin contributes to the modelexplorer. It provides an action to display only the diagrams in the ModelExplorer.">
-  <referent firstName="Patrick" lastName="Tessier" eMail="patrick.tessier@cea.fr" currentCompany="CEA-LIST"/>
-  <referent firstName="Vincent" lastName="Lorenzo" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA-LIST"/>
-</doc:Documentation>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/plugin.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/plugin.properties
index 2011463e24f..2c0f4345ece 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/plugin.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.modelexplorer/plugin.properties
@@ -10,3 +10,5 @@
 ##################################################################################
 pluginName=UML Diagram ModelExplorer
 providerName=Eclipse Modeling Project
+
+pluginDescription=This plugin contributes to the modelexplorer. It provides an action to display only the diagrams in the ModelExplorer.
+\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF
index b3e7e29bcc1..bd28f83f5ea 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF
@@ -1,89 +1,90 @@
-Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.uml.diagram.profile,
- org.eclipse.papyrus.uml.diagram.profile.custom.commands,
- org.eclipse.papyrus.uml.diagram.profile.custom.edit.parts,
- org.eclipse.papyrus.uml.diagram.profile.custom.factory,
- org.eclipse.papyrus.uml.diagram.profile.custom.figure,
- org.eclipse.papyrus.uml.diagram.profile.custom.helper,
- org.eclipse.papyrus.uml.diagram.profile.custom.messages,
- org.eclipse.papyrus.uml.diagram.profile.custom.policies,
- org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic,
- org.eclipse.papyrus.uml.diagram.profile.custom.preferences,
- org.eclipse.papyrus.uml.diagram.profile.custom.providers,
- org.eclipse.papyrus.uml.diagram.profile.custom.requests,
- org.eclipse.papyrus.uml.diagram.profile.edit.commands,
- org.eclipse.papyrus.uml.diagram.profile.edit.helpers,
- org.eclipse.papyrus.uml.diagram.profile.edit.parts,
- org.eclipse.papyrus.uml.diagram.profile.edit.policies,
- org.eclipse.papyrus.uml.diagram.profile.navigator,
- org.eclipse.papyrus.uml.diagram.profile.parsers,
- org.eclipse.papyrus.uml.diagram.profile.part,
- org.eclipse.papyrus.uml.diagram.profile.preferences,
- org.eclipse.papyrus.uml.diagram.profile.providers,
- org.eclipse.papyrus.uml.diagram.profile.service,
- org.eclipse.papyrus.uml.diagram.profile.sheet
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.1.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",
- org.eclipse.papyrus.uml.profile;bundle-version="1.1.0",
- org.eclipse.core.expressions,
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.1.0",
- org.eclipse.papyrus.uml.appearance;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.services.validation;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.1.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",
- org.eclipse.ui.ide;bundle-version="3.8.0",
- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.1.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",
- org.eclipse.gmf.tooling.runtime;bundle-version="3.0.0",
- org.eclipse.uml2.uml.edit;bundle-version="4.0.100",
- org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.7.0",
- org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="1.7.0",
- org.eclipse.ui.navigator;bundle-version="3.5.200",
- org.eclipse.ui.navigator.resources;bundle-version="3.4.400",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",
- org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.7.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.emf.diagram.common;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.jface,
- org.eclipse.ui.views,
- org.eclipse.emf.ecore,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.emf.edit.ui,
- org.eclipse.gmf.runtime.emf.core,
- org.eclipse.gmf.runtime.emf.commands.core,
- org.eclipse.gmf.runtime.emf.ui.properties,
- org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.papyrus.uml.service.types;bundle-version="1.1.0",
- org.eclipse.gmf.runtime.diagram.ui.providers.ide,
- org.eclipse.gmf.runtime.diagram.ui.render,
- org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide,
- org.eclipse.draw2d,
- org.eclipse.gmf.runtime.draw2d.ui,
- org.eclipse.uml2.uml,
- org.eclipse.emf.ecore,
- org.eclipse.emf.ecore.edit,
- org.eclipse.ocl.ecore,
- org.eclipse.emf.validation,
- org.eclipse.gef,
- org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0"
-Bundle-Vendor: %providerName
-Eclipse-LazyStart: true
-Bundle-Version: 1.1.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.profile; singleton:=true
+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.diagram.profile,
+ org.eclipse.papyrus.uml.diagram.profile.custom.commands,
+ org.eclipse.papyrus.uml.diagram.profile.custom.edit.parts,
+ org.eclipse.papyrus.uml.diagram.profile.custom.factory,
+ org.eclipse.papyrus.uml.diagram.profile.custom.figure,
+ org.eclipse.papyrus.uml.diagram.profile.custom.helper,
+ org.eclipse.papyrus.uml.diagram.profile.custom.messages,
+ org.eclipse.papyrus.uml.diagram.profile.custom.policies,
+ org.eclipse.papyrus.uml.diagram.profile.custom.policies.itemsemantic,
+ org.eclipse.papyrus.uml.diagram.profile.custom.preferences,
+ org.eclipse.papyrus.uml.diagram.profile.custom.providers,
+ org.eclipse.papyrus.uml.diagram.profile.custom.requests,
+ org.eclipse.papyrus.uml.diagram.profile.edit.commands,
+ org.eclipse.papyrus.uml.diagram.profile.edit.helpers,
+ org.eclipse.papyrus.uml.diagram.profile.edit.parts,
+ org.eclipse.papyrus.uml.diagram.profile.edit.policies,
+ org.eclipse.papyrus.uml.diagram.profile.navigator,
+ org.eclipse.papyrus.uml.diagram.profile.parsers,
+ org.eclipse.papyrus.uml.diagram.profile.part,
+ org.eclipse.papyrus.uml.diagram.profile.preferences,
+ org.eclipse.papyrus.uml.diagram.profile.providers,
+ org.eclipse.papyrus.uml.diagram.profile.service,
+ org.eclipse.papyrus.uml.diagram.profile.sheet
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Name: %pluginName
+Bundle-Description: %pluginDescription
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.eclipse.papyrus.extensionpoints.editors;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.profile;bundle-version="1.1.0",
+ org.eclipse.core.expressions,
+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.appearance;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.services.validation;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",
+ org.eclipse.ui.ide;bundle-version="3.8.0",
+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",
+ org.eclipse.gmf.tooling.runtime;bundle-version="3.0.0",
+ org.eclipse.uml2.uml.edit;bundle-version="4.0.100",
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.7.0",
+ org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="1.7.0",
+ org.eclipse.ui.navigator;bundle-version="3.5.200",
+ org.eclipse.ui.navigator.resources;bundle-version="3.4.400",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",
+ org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.7.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.emf.diagram.common;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.1.0",
+ org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.jface,
+ org.eclipse.ui.views,
+ org.eclipse.emf.ecore,
+ org.eclipse.emf.ecore.xmi,
+ org.eclipse.emf.edit.ui,
+ org.eclipse.gmf.runtime.emf.core,
+ org.eclipse.gmf.runtime.emf.commands.core,
+ org.eclipse.gmf.runtime.emf.ui.properties,
+ org.eclipse.gmf.runtime.diagram.ui,
+ org.eclipse.papyrus.uml.service.types;bundle-version="1.1.0",
+ org.eclipse.gmf.runtime.diagram.ui.providers.ide,
+ org.eclipse.gmf.runtime.diagram.ui.render,
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide,
+ org.eclipse.draw2d,
+ org.eclipse.gmf.runtime.draw2d.ui,
+ org.eclipse.uml2.uml,
+ org.eclipse.emf.ecore,
+ org.eclipse.emf.ecore.edit,
+ org.eclipse.ocl.ecore,
+ org.eclipse.emf.validation,
+ org.eclipse.gef,
+ org.eclipse.papyrus.infra.viewpoints.configuration;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="1.1.0"
+Bundle-Vendor: %providerName
+Eclipse-LazyStart: true
+Bundle-Version: 1.1.0.qualifier
+Bundle-Activator: org.eclipse.papyrus.uml.diagram.profile.part.UMLDiagramEditorPlugin
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.profile; singleton:=true
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/build.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/build.properties
index 4a6d010b4cf..e51935ea285 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/build.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/build.properties
@@ -1,16 +1,15 @@
-#
-#Mon Sep 12 09:29:47 CEST 2011
-bin.includes = META-INF/,\
-               .,\
-               icons/,\
-               about.html,\
-               messages.properties,\
-               model/,\
-               plugin.properties,\
-               plugin.xml,\
-               plugin.pdoc
-output..=bin/
-jars.compile.order=.
-src.includes = about.html
-source..=src/,custom-src/
-bin..=bin/
+#
+#Mon Sep 12 09:29:47 CEST 2011
+bin.includes = META-INF/,\
+               .,\
+               icons/,\
+               about.html,\
+               messages.properties,\
+               model/,\
+               plugin.properties,\
+               plugin.xml
+output..=bin/
+jars.compile.order=.
+src.includes = about.html
+source..=src/,custom-src/
+bin..=bin/
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/plugin.pdoc b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/plugin.pdoc
deleted file mode 100644
index 297b3212a1a..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides the UML Profile Diagram">
-  <referent firstName="Vincent" lastName="Lorenzo" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/plugin.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/plugin.properties
index 8d6c1f7940b..efce0f99e97 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/plugin.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/plugin.properties
@@ -86,3 +86,5 @@ metatype.name.PrimitiveType_2009=PrimitiveType
 metatype.name.ConstraintContext_8500=Undefined
 metatype.name.Class_2008=Class
 metatype.name.Class_3010=Class
+
+pluginDescription=This plugin provides the UML Profile Diagram
+\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/META-INF/MANIFEST.MF
index 62087735cff..23e337b723b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/META-INF/MANIFEST.MF
@@ -30,4 +30,4 @@ Bundle-Description: The pupose of this plugin is add the fucntionality
 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.stereotype.editio
  n;singleton:=true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
+Bundle-Description: %pluginDescription
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/build.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/build.properties
index 8013a222c4b..bc40c8bd26b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/build.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/build.properties
@@ -7,4 +7,3 @@ bin.includes = META-INF/,\
                plugin.properties
 src.includes = about.html,\
                docs/,\
-               plugin.pdoc
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/plugin.pdoc b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/plugin.pdoc
deleted file mode 100644
index fb1783dd8d0..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="The pupose of this plugin is add the fucntionality to display stereotype into compartment or into comment of applied stereotype&#xD;&#xA;More details (models and file.doc) has been store in the docs directory.&#xD;&#xA;">
-  <referent firstName="Patrick" lastName="Tessier" eMail="patrick.tessier@cea.fr" currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/plugin.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/plugin.properties
index 2133d2582d3..e4be8a649e9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/plugin.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/plugin.properties
@@ -16,3 +16,5 @@ context.description=UML Diagram Editing
 context.name=In UML Diagram Editor
 
 
+
+pluginDescription=The pupose of this plugin is add the fucntionality to display stereotype into compartment or into comment of applied stereotype More details (models and file.doc) has been store in the docs directory. 
+\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/META-INF/MANIFEST.MF
index 77a3988aece..942767752bf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/META-INF/MANIFEST.MF
@@ -1,31 +1,31 @@
-Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.uml.diagram.symbols,
- org.eclipse.papyrus.uml.diagram.symbols.provider
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime;bundle-version="3.8.0",
- org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.1.0",
- org.eclipse.papyrus.uml.profile;bundle-version="1.1.0",
- org.eclipse.uml2.uml;bundle-version="4.0.0",
- org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.6.0",
- org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.5.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",
- org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="1.6.0",
- org.eclipse.gmf.runtime.draw2d.ui.render;bundle-version="1.4.1",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",
- org.eclipse.papyrus.uml.appearance;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",
+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.diagram.symbols,
+ org.eclipse.papyrus.uml.diagram.symbols.provider
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime;bundle-version="3.8.0",
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.profile;bundle-version="1.1.0",
+ org.eclipse.uml2.uml;bundle-version="4.0.0",
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="1.1.0",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.6.0",
+ org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="1.5.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",
+ org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="1.6.0",
+ org.eclipse.gmf.runtime.draw2d.ui.render;bundle-version="1.4.1",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.appearance;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",
  org.w3c.dom.svg;bundle-version="1.1.0"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.1.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.uml.diagram.symbols.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.symbols;singleton
- :=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-
+Bundle-Vendor: %Bundle-Vendor
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.1.0.qualifier
+Bundle-Name: %Bundle-Name
+Bundle-Activator: org.eclipse.papyrus.uml.diagram.symbols.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.symbols;singleton
+ :=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-Description: %pluginDescription
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/build.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/build.properties
index bc13f8e21c2..032b225cbd8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/build.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/build.properties
@@ -1,14 +1,12 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               resources/,\
-               plugin.xml,\
-               icons/,\
-               about.html,\
-               OSGI-INF/,\
-               documentation.pdoc
-src.includes = about.html,\
-               icons/,\
-               documentation.pdoc,\
-               resources/
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               resources/,\
+               plugin.xml,\
+               icons/,\
+               about.html,\
+               OSGI-INF/
+src.includes = about.html,\
+               icons/,\
+               resources/
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/documentation.pdoc b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/documentation.pdoc
deleted file mode 100644
index 31230365dbc..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/documentation.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin contributes to the Shape Service. It proposes a profile to annote elements in a UML model. First implementation is the possibility to annote Types and to display the associated shape on this type representations and the representations of TypedElement typed by this annotated type.">
-  <referent firstName="Remi" lastName="Schnekenburger" eMail="remi.schnekenburger@cea.fr" currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/plugin.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/plugin.properties
new file mode 100644
index 00000000000..3228d2e8a1b
--- /dev/null
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+# Copyright (c) 2015 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
+##################################################################################)
+
+pluginDescription=This plugin contributes to the Shape Service. It proposes a profile to annote elements in a UML model. First implementation is the possibility to annote Types and to display the associated shape on this type representations and the representations of TypedElement typed by this annotated type.
+\ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.synchronizeview/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.synchronizeview/META-INF/MANIFEST.MF
index 4e0447c0375..5f28e7511c6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.synchronizeview/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.synchronizeview/META-INF/MANIFEST.MF
@@ -26,4 +26,4 @@ Bundle-Description: The goal of this plugin is add the fucntionality t
 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.synchronizeview;s
  ingleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-
+Bundle-Description: %pluginDescription
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.synchronizeview/build.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.synchronizeview/build.properties
index 8e9aac22f89..8539c191e15 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.synchronizeview/build.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.synchronizeview/build.properties
@@ -5,6 +5,5 @@ bin.includes = META-INF/,\
                plugin.xml,\
                about.html,\
                plugin.properties,\
-               plugin.pdoc,\
                schema/
 src.includes = about.html
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.synchronizeview/plugin.pdoc b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.synchronizeview/plugin.pdoc
deleted file mode 100644
index d01137108d0..00000000000
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.synchronizeview/plugin.pdoc
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation
-    xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI"
-    xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation"
-    description="The goal of this plugin is add the fucntionality to synchronize elements in diagram. &#xD;&#xA;More details (models and .html) has been store in the docs directory.&#xD;&#xA;">
-  <referent
-      firstName="Patrick"
-      lastName="Tessier"
-      eMail="patrick.tessier@cea.fr"
-      currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.synchronizeview/plugin.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.synchronizeview/plugin.properties
index 663fbb48920..f3ebaf007e9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.synchronizeview/plugin.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.synchronizeview/plugin.properties
@@ -10,3 +10,5 @@
 ##################################################################################
 pluginName=org.eclipse.papyrus.uml.diagram.synchronizeview
 providerName=Eclipse Modeling Project
+
+pluginDescription=The goal of this plugin is add the fucntionality to synchronize elements in diagram.  More details (models and .html) has been store in the docs directory. 
+\ No newline at end of file
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/META-INF/MANIFEST.MF
index cde00132236..f7e401afe97 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/META-INF/MANIFEST.MF
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/META-INF/MANIFEST.MF
@@ -17,4 +17,4 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.generic;singleto
  n:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-
+Bundle-Description: %pluginDescription
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/build.properties b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/build.properties
index e9255071473..569579cede0 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/build.properties
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/build.properties
@@ -4,7 +4,6 @@ bin.includes = META-INF/,\
                .,\
                plugin.xml,\
                icons/,\
-               plugin.pdoc,\
                about.html,\
                OSGI-INF/
 src.includes = about.html
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/plugin.pdoc b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/plugin.pdoc
deleted file mode 100644
index b7eb078fb29..00000000000
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides the generic uml tabular editor.">
-  <referent firstName="Vincent" lastName="LORENZO" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/plugin.properties b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/plugin.properties
new file mode 100644
index 00000000000..00b355dc978
--- /dev/null
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+# Copyright (c) 2015 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
+##################################################################################)
+
+pluginDescription=This plugin provides the generic uml tabular editor.
+\ No newline at end of file
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/META-INF/MANIFEST.MF
index c2197ee99ea..000ac02c6a9 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/META-INF/MANIFEST.MF
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/META-INF/MANIFEST.MF
@@ -29,4 +29,4 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.menu;singleton:=
  true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-
+Bundle-Description: %pluginDescription
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/build.properties b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/build.properties
index 7ff7de30022..7fbb117b679 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/build.properties
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/build.properties
@@ -1,10 +1,9 @@
-source.. = src/,\
-           src-gen/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               about.html,\
-               OSGI-INF/,\
-               plugin.pdoc
-src.includes = about.html
+source.. = src/,\
+           src-gen/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               about.html,\
+               OSGI-INF/
+src.includes = about.html
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/plugin.pdoc b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/plugin.pdoc
deleted file mode 100644
index 0e71d9ebd32..00000000000
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides the context menu for the tabular editor in UML, with handlers for the creation of UML model elements">
-  <referent firstName="Juan" lastName="Cadavid" eMail="juan.cadavid@cea.fr" currentCompany="CEA-LIST"/>
-</doc:Documentation>
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/plugin.properties b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/plugin.properties
new file mode 100644
index 00000000000..724b1bd9f9f
--- /dev/null
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.menu/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+# Copyright (c) 2015 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
+##################################################################################)
+
+pluginDescription=This plugin provides the context menu for the tabular editor in UML, with handlers for the creation of UML model elements
+\ No newline at end of file
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/META-INF/MANIFEST.MF
index dd1512c37a7..6964ea451be 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/META-INF/MANIFEST.MF
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/META-INF/MANIFEST.MF
@@ -24,4 +24,4 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.xtext.integratio
  n
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-
+Bundle-Description: %pluginDescription
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/build.properties b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/build.properties
index efe5828f95a..30c35d74ee2 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/build.properties
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/build.properties
@@ -1,8 +1,7 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               OSGI-INF/,\
-               about.html,\
-               plugin.pdoc
-src.includes = about.html
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               OSGI-INF/,\
+               about.html
+src.includes = about.html
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/plugin.pdoc b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/plugin.pdoc
deleted file mode 100644
index a289d22c016..00000000000
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides the required classes to open XText Editor as CellEditor in Papyrus Table">
-  <referent firstName="Vincent" lastName="LORENZO" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/plugin.properties b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/plugin.properties
new file mode 100644
index 00000000000..8a72fb9e854
--- /dev/null
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.xtext.integration/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+# Copyright (c) 2015 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
+##################################################################################)
+
+pluginDescription=This plugin provides the required classes to open XText Editor as CellEditor in Papyrus Table
+\ No newline at end of file
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/META-INF/MANIFEST.MF
index a8c9f980a25..dbfa97c5c9e 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/META-INF/MANIFEST.MF
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/META-INF/MANIFEST.MF
@@ -43,4 +43,3 @@ Bundle-Activator: org.eclipse.papyrus.uml.nattable.Activator
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable;singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Bundle-Localization: plugin
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/build.properties b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/build.properties
index 5e9a1da3183..2ba3bfba0d7 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/build.properties
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/build.properties
@@ -3,7 +3,6 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                about.html,\
-               plugin.pdoc,\
                plugin.xml,\
                icons/,\
                plugin.properties
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/plugin.pdoc b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/plugin.pdoc
deleted file mode 100644
index b4e5c067f2c..00000000000
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides the celleditors for the ULM Element">
-  <referent firstName="Vincent" lastName="LORENZO" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/plugin.properties b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/plugin.properties
index 05f8ec275bb..a365f272193 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/plugin.properties
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/plugin.properties
@@ -1,4 +1,5 @@
 #Properties file for org.eclipse.papyrus.uml.nattable
 Bundle-Vendor = Eclipse Modeling Project
 Bundle-Name = UML Nattable
-Bundle-Description = This plugin provides the celleditors for the UML Element
-\ No newline at end of file
+Bundle-Description = This plugin provides the celleditors for the UML Element
+pluginDescription=This plugin provides the celleditors for the ULM Element
+\ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/META-INF/MANIFEST.MF
index 26563063d9a..2a4c3d34acc 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/META-INF/MANIFEST.MF
@@ -39,4 +39,4 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.uml.modelrepair;singleton:=tr
  ue
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
+Bundle-Description: %pluginDescription
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/plugin.pdoc b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/plugin.pdoc
deleted file mode 100644
index e4d07cd16d8..00000000000
--- a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/plugin.pdoc
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides some utility features to switch from profile/library to registered ones.">
-  <referent firstName="Camille" lastName="Letavernier" eMail="camille.letavernier@cea.fr" currentCompany="CEA-LIST"/>
-  <referent firstName="vincent" lastName="lorenzo" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA-LIST"/>
-</doc:Documentation>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.modelrepair/plugin.properties b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/plugin.properties
new file mode 100644
index 00000000000..b00d9df81fe
--- /dev/null
+++ b/plugins/uml/org.eclipse.papyrus.uml.modelrepair/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+# Copyright (c) 2015 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
+##################################################################################)
+
+pluginDescription=This plugin provides some utility features to switch from profile/library to registered ones.
+\ No newline at end of file
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 f4325b5662a..0e315687c63 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
@@ -60,4 +60,4 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.uml.properties;singleton:=tru
  e
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
+Bundle-Description: %pluginDescription
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/plugin.properties b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/plugin.properties
index 6e5541361f6..8c8800662e8 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/plugin.properties
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/plugin.properties
@@ -1,10 +1,12 @@
-
-# <copyright>
-# </copyright>
-#
-# $Id$
-
-pluginName = Papyrus properties UML
-providerName = Eclipse Modeling Project
-
-extension-point.name = LanguageEditor
+
+# <copyright>
+# </copyright>
+#
+# $Id$
+
+pluginName = Papyrus properties UML
+providerName = Eclipse Modeling Project
+
+extension-point.name = LanguageEditor
+
+pluginDescription=The UML Property view configuration. Provides the UML property view configuration (Semantic  Appearance), UML-specific tools and widgets, and profile/stereotypes support.
+\ No newline at end of file
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/uml-properties.pdoc b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/uml-properties.pdoc
deleted file mode 100644
index 0110d9c154a..00000000000
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/uml-properties.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="The UML Property view configuration.&#xD;&#xA;&#xD;&#xA;Provides the UML property view configuration (Semantic &amp; Appearance), UML-specific tools and widgets, and profile/stereotypes support.">
-  <referent firstName="Camille" lastName="Letavernier" eMail="camille.letavernier@cea.fr" currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/META-INF/MANIFEST.MF b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/META-INF/MANIFEST.MF
index 6ee8d798170..ee025192221 100644
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/META-INF/MANIFEST.MF
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/META-INF/MANIFEST.MF
@@ -46,4 +46,4 @@ Bundle-Activator: org.eclipse.papyrus.uml.tools.Activator
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.uml.tools;singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-
+Bundle-Description: %pluginDescription
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/UML Tools.pdoc b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/UML Tools.pdoc
deleted file mode 100644
index 58fc570b39d..00000000000
--- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/UML Tools.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin contributes a set of common tools for UML">
-  <referent firstName="Camille" lastName="Letavernier" eMail="camille.letavernier@cea.fr" currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/plugin.properties b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/plugin.properties
new file mode 100644
index 00000000000..c0ddb4180e8
--- /dev/null
+++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+# Copyright (c) 2015 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
+##################################################################################)
+
+pluginDescription=This plugin contributes a set of common tools for UML
+\ No newline at end of file
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/META-INF/MANIFEST.MF b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/META-INF/MANIFEST.MF
index ebfb7d55028..911f58757ea 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/META-INF/MANIFEST.MF
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/META-INF/MANIFEST.MF
@@ -1,32 +1,32 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.emf.transaction,
- org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",
- org.eclipse.papyrus.uml.service.types;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
- org.eclipse.gmf.runtime.common.core,
- org.eclipse.gmf.runtime.emf.type.core,
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.newchild;bundle-version="1.1.0",
- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0"
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.1.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-Activator: org.eclipse.papyrus.views.modelexplorer.newchild.Act
- ivator
-Bundle-ManifestVersion: 2
-Bundle-Description: The purpose of this plugin  is to do the connectio
- n with the model explorer is org.eclipse.papyrus.view.modelexplorer.n
- ewchild. More documentation (models and file.doc) has been store in t
- he docs directory of the plugin org.eclipse.papyrus.infra.newchild
-Bundle-SymbolicName: org.eclipse.papyrus.views.modelexplorer.newchild;
- singleton:=true
+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.emf.transaction,
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.service.types;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
+ org.eclipse.gmf.runtime.common.core,
+ org.eclipse.gmf.runtime.emf.type.core,
+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.newchild;bundle-version="1.1.0",
+ org.eclipse.papyrus.views.modelexplorer;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.1.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.views.modelexplorer.newchild.Act
+ ivator
+Bundle-ManifestVersion: 2
+Bundle-Description: The purpose of this plugin  is to do the connectio
+ n with the model explorer is org.eclipse.papyrus.view.modelexplorer.n
+ ewchild. More documentation (models and file.doc) has been store in t
+ he docs directory of the plugin org.eclipse.papyrus.infra.newchild
+Bundle-SymbolicName: org.eclipse.papyrus.views.modelexplorer.newchild;
+ singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-
+Bundle-Description: %pluginDescription
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/plugin.pdoc b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/plugin.pdoc
deleted file mode 100644
index bbf297fc31c..00000000000
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="The purpose of this plugin  is to do the connection with the model explorer is org.eclipse.papyrus.view.modelexplorer.newchild. &#xD;&#xA;More documentation (models and file.doc) has been store in the docs directory of the plugin org.eclipse.papyrus.infra.newchild">
-  <referent firstName="Patrick" lastName="Tessier" eMail="patrick.tessier@cea.fr" currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/plugin.properties b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/plugin.properties
index 8b6fe86ebb8..3b12deb0bbd 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/plugin.properties
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.newchild/plugin.properties
@@ -10,3 +10,5 @@
 ##################################################################################
 pluginName=Papyrus view model explorer new child
 providerName=Eclipse Modeling Project
+
+pluginDescription=The purpose of this plugin  is to do the connection with the model explorer is org.eclipse.papyrus.view.modelexplorer.newchild. &#xD;&#xA;More documentation (models and file.doc) has been store in the docs directory of the plugin org.eclipse.papyrus.infra.newchild
+\ No newline at end of file
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF
index 9d8ecd02b37..e4a371b1272 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF
@@ -63,4 +63,4 @@ Bundle-Activator: org.eclipse.papyrus.views.modelexplorer.Activator
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.views.modelexplorer;singleton
  :=true
-
+Bundle-Description: %pluginDescription
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/documentation.pdoc b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/documentation.pdoc
deleted file mode 100644
index 79de1997b6a..00000000000
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/documentation.pdoc
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides the ModelExplorer View to discover the model">
-  <referent firstName="Patrick" lastName="Tessier" eMail="patrick.tessier@cea.fr" currentCompany="CEA-LIST"/>
-  <referent firstName="Vincent" lastName="Lorenzo" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA-LIST"/>
-  <additionalComments title="forbidden dependencies" contents="This plugin should not depend on Diagram, Table, UML"/>
-</doc:Documentation>
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/plugin.properties b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/plugin.properties
index 0a3ce6694f7..46df713cd09 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/plugin.properties
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/plugin.properties
@@ -16,3 +16,5 @@ providerName=Eclipse Modeling Project
 navigatorContent= Model Contents
 executequery=Execute Query...
 
+
+pluginDescription=This plugin provides the ModelExplorer View to discover the model
+\ No newline at end of file
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/META-INF/MANIFEST.MF b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/META-INF/MANIFEST.MF
index 9b7c2104c24..7a83abee72f 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/META-INF/MANIFEST.MF
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/META-INF/MANIFEST.MF
@@ -1,24 +1,24 @@
-Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.views.properties.contexts,
- org.eclipse.papyrus.views.properties.contexts.impl,
- org.eclipse.papyrus.views.properties.contexts.util,
- org.eclipse.papyrus.views.properties.environment,
- org.eclipse.papyrus.views.properties.environment.impl,
- org.eclipse.papyrus.views.properties.environment.util,
- org.eclipse.papyrus.views.properties.ui,
- org.eclipse.papyrus.views.properties.ui.impl,
- org.eclipse.papyrus.views.properties.ui.util
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;bundle-version="2.7.0";visibility:=reexport,
- org.eclipse.emf.ecore.xmi;visibility:=reexport,
- org.eclipse.papyrus.infra.constraints;bundle-version="1.1.0";visibility:=reexport
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.1.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.views.properties.model;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-
+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.views.properties.contexts,
+ org.eclipse.papyrus.views.properties.contexts.impl,
+ org.eclipse.papyrus.views.properties.contexts.util,
+ org.eclipse.papyrus.views.properties.environment,
+ org.eclipse.papyrus.views.properties.environment.impl,
+ org.eclipse.papyrus.views.properties.environment.util,
+ org.eclipse.papyrus.views.properties.ui,
+ org.eclipse.papyrus.views.properties.ui.impl,
+ org.eclipse.papyrus.views.properties.ui.util
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;bundle-version="2.7.0";visibility:=reexport,
+ org.eclipse.emf.ecore.xmi;visibility:=reexport,
+ org.eclipse.papyrus.infra.constraints;bundle-version="1.1.0";visibility:=reexport
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 1.1.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.views.properties.model;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-Description: %pluginDescription
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/build.properties b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/build.properties
index 7686535db4b..ece87407f14 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/build.properties
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/build.properties
@@ -1,10 +1,9 @@
-#
-#Mon Sep 12 09:30:04 CEST 2011
-output..=bin/
-bin.includes=.,META-INF/,plugin.xml,plugin.properties,Model/,about.html
-jars.compile.order=.
-src.includes = about.html,\
-               properties-model.pdoc
-src-gen.includes=Model/,META-INF/,plugin.xml,plugin.properties
-source..=src-gen/
-bin..=bin/
+#
+#Mon Sep 12 09:30:04 CEST 2011
+output..=bin/
+bin.includes=.,META-INF/,plugin.xml,plugin.properties,Model/,about.html
+jars.compile.order=.
+src.includes = about.html
+src-gen.includes=Model/,META-INF/,plugin.xml,plugin.properties
+source..=src-gen/
+bin..=bin/
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/plugin.properties b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/plugin.properties
index f0f5f361b12..88864f55f80 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/plugin.properties
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/plugin.properties
@@ -1,8 +1,10 @@
-
-# <copyright>
-# </copyright>
-#
-# $Id$
-
-pluginName = Papyrus properties model
-providerName = Eclipse Modeling Project
+
+# <copyright>
+# </copyright>
+#
+# $Id$
+
+pluginName = Papyrus properties model
+providerName = Eclipse Modeling Project
+
+pluginDescription=An EMF Model for defining a Property view configuration. It contains three packages:  - The Environment packages describes the tools available for defining a property view: Widgets, Data manipulation, ... - The Context package describing the behavior for a property view: Data manipulation, conditions under which a view is displayed, ... - The UI package describes a single view, graphically: widgets, hierarchy, layout
+\ No newline at end of file
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/properties-model.pdoc b/plugins/views/properties/org.eclipse.papyrus.views.properties.model/properties-model.pdoc
deleted file mode 100644
index 384d0e2ada3..00000000000
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.model/properties-model.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="An EMF Model for defining a Property view configuration.&#xD;&#xA;&#xD;&#xA;It contains three packages: &#xD;&#xA;&#xD;&#xA;- The Environment packages describes the tools available for defining a property view: Widgets, Data manipulation, ...&#xD;&#xA;- The Context package describing the behavior for a property view: Data manipulation, conditions under which a view is displayed, ...&#xD;&#xA;- The UI package describes a single view, graphically: widgets, hierarchy, layout">
-  <referent firstName="Camille" lastName="Letavernier" eMail="camille.letavernier@cea.fr" currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/META-INF/MANIFEST.MF b/plugins/views/properties/org.eclipse.papyrus.views.properties/META-INF/MANIFEST.MF
index b9ef9e626fc..903416303f8 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties/META-INF/MANIFEST.MF
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/META-INF/MANIFEST.MF
@@ -52,4 +52,4 @@ Bundle-Activator: org.eclipse.papyrus.views.properties.Activator
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.views.properties;singleton:=t
  rue
-
+Bundle-Description: %pluginDescription
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/Properties.pdoc b/plugins/views/properties/org.eclipse.papyrus.views.properties/Properties.pdoc
deleted file mode 100644
index dec431836ed..00000000000
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties/Properties.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plug-in contains the runtime elements for the property view framework, as well as a set of basic tools: basic property editors, EMF Data manipulation, ...">
-  <referent firstName="Camille" lastName="Letavernier" eMail="camille.letavernier@cea.fr" currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/build.properties b/plugins/views/properties/org.eclipse.papyrus.views.properties/build.properties
index adbbb5a5980..65ec18e4923 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties/build.properties
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/build.properties
@@ -1,9 +1,8 @@
-#
-#Mon Sep 12 09:30:04 CEST 2011
-output..=bin/
-bin.includes=.,META-INF/,plugin.xml,plugin.properties,model/,schema/,about.html,icons/
-jars.compile.order=.
-src.includes = about.html,\
-               Properties.pdoc
-source..=src/,src-gen/
-bin..=bin/
+#
+#Mon Sep 12 09:30:04 CEST 2011
+output..=bin/
+bin.includes=.,META-INF/,plugin.xml,plugin.properties,model/,schema/,about.html,icons/
+jars.compile.order=.
+src.includes = about.html
+source..=src/,src-gen/
+bin..=bin/
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties/plugin.properties b/plugins/views/properties/org.eclipse.papyrus.views.properties/plugin.properties
index d7f400ebb71..258ef9319f0 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties/plugin.properties
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties/plugin.properties
@@ -18,3 +18,5 @@ page.name = Property views
 extension-point.context = Context
 extension-point.environment = Environment
 extension-point.contextStorage = Context Storage Providers
+
+pluginDescription=This plug-in contains the runtime elements for the property view framework, as well as a set of basic tools: basic property editors, EMF Data manipulation, ...
+\ No newline at end of file
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/META-INF/MANIFEST.MF b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/META-INF/MANIFEST.MF
index ae77fba38fe..563bfa3db93 100644
--- a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/META-INF/MANIFEST.MF
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/META-INF/MANIFEST.MF
@@ -28,4 +28,3 @@ Export-Package: org.eclipse.papyrus.moka.fuml.standardlibrary.library.boolean_,
  org.eclipse.papyrus.moka.fuml.standardlibrary.library.io,
  org.eclipse.papyrus.moka.fuml.standardlibrary.library.list,
  org.eclipse.papyrus.moka.fuml.standardlibrary.library.string,
- org.eclipse.papyrus.moka.fuml.standardlibrary.library.unlimitednatural
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/plugin.pdoc b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/plugin.pdoc
deleted file mode 100644
index 93ce4eeb1f4..00000000000
--- a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="OpaqueBehaviorExecutions for the standard fUML library">
-  <referent firstName="Arnaud" lastName="Cuccuru" eMail="arnaud.cuccuru@cea.fr" currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/plugin.properties b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/plugin.properties
new file mode 100644
index 00000000000..07b6d6e4fb0
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml.standardlibrary/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+# Copyright (c) 2015 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
+##################################################################################)
+
+pluginDescription=OpaqueBehaviorExecutions for the standard fUML library
+\ No newline at end of file
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml/META-INF/MANIFEST.MF b/sandbox/Moka/org.eclipse.papyrus.moka.fuml/META-INF/MANIFEST.MF
index 21cd53b40ea..6ed7a032b81 100644
--- a/sandbox/Moka/org.eclipse.papyrus.moka.fuml/META-INF/MANIFEST.MF
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml/META-INF/MANIFEST.MF
@@ -34,4 +34,3 @@ Export-Package: org.eclipse.papyrus.moka.fuml;uses:="org.eclipse.ui.plugin,org.o
  org.eclipse.papyrus.moka.fuml.presentation,
  org.eclipse.papyrus.moka.fuml.registry
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Vendor: %Bundle-Vendor
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml/plugin.pdoc b/sandbox/Moka/org.eclipse.papyrus.moka.fuml/plugin.pdoc
deleted file mode 100644
index efb8e0a040c..00000000000
--- a/sandbox/Moka/org.eclipse.papyrus.moka.fuml/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="A straightforward implementation of fUML 1.1 Execution Model.&#xD;&#xA;Contributes to &quot;Moka execution engine&quot; extension point.">
-  <referent firstName="Arnaud" lastName="Cuccuru" eMail="arnaud.cuccuru@cea.fr" currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka.fuml/plugin.properties b/sandbox/Moka/org.eclipse.papyrus.moka.fuml/plugin.properties
new file mode 100644
index 00000000000..c39c72b1520
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka.fuml/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+# Copyright (c) 2015 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
+##################################################################################)
+
+pluginDescription=A straightforward implementation of fUML 1.1 Execution Model. Contributes to Moka execution engine&quot; extension point.
+\ No newline at end of file
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka/META-INF/MANIFEST.MF b/sandbox/Moka/org.eclipse.papyrus.moka/META-INF/MANIFEST.MF
index 769f6b0e515..2413a1349d0 100644
--- a/sandbox/Moka/org.eclipse.papyrus.moka/META-INF/MANIFEST.MF
+++ b/sandbox/Moka/org.eclipse.papyrus.moka/META-INF/MANIFEST.MF
@@ -33,4 +33,3 @@ Export-Package: org.eclipse.papyrus.moka,
  org.eclipse.papyrus.moka.communication.request.iterminate,
  org.eclipse.papyrus.moka.debug,
  org.eclipse.papyrus.moka.engine,
- org.eclipse.papyrus.moka.launch
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka/plugin.pdoc b/sandbox/Moka/org.eclipse.papyrus.moka/plugin.pdoc
deleted file mode 100644
index 45da37f970e..00000000000
--- a/sandbox/Moka/org.eclipse.papyrus.moka/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="Moka is an extendible framework for model execution.">
-  <referent firstName="Arnaud" lastName="Cuccuru" eMail="arnaud.cuccuru@cea.fr" currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/sandbox/Moka/org.eclipse.papyrus.moka/plugin.properties b/sandbox/Moka/org.eclipse.papyrus.moka/plugin.properties
new file mode 100644
index 00000000000..770424f73c1
--- /dev/null
+++ b/sandbox/Moka/org.eclipse.papyrus.moka/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+# Copyright (c) 2015 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
+##################################################################################)
+
+pluginDescription=Moka is an extendible framework for model execution.
+\ No newline at end of file
diff --git a/sandbox/org.eclipse.papyrus.test.common/META-INF/MANIFEST.MF b/sandbox/org.eclipse.papyrus.test.common/META-INF/MANIFEST.MF
index d9cba884ac1..da3108c56a6 100644
--- a/sandbox/org.eclipse.papyrus.test.common/META-INF/MANIFEST.MF
+++ b/sandbox/org.eclipse.papyrus.test.common/META-INF/MANIFEST.MF
@@ -15,4 +15,3 @@ Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.papyrus.test.common.tests
 Bundle-Vendor: %providerName
-Bundle-Localization: plugin
diff --git a/sandbox/org.eclipse.papyrus.test.common/build.properties b/sandbox/org.eclipse.papyrus.test.common/build.properties
index 86d84028606..8f6db111733 100644
--- a/sandbox/org.eclipse.papyrus.test.common/build.properties
+++ b/sandbox/org.eclipse.papyrus.test.common/build.properties
@@ -3,7 +3,5 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.properties,\
-               documentation.pdoc
 src.includes = plugin.properties,\
-               documentation.pdoc,\
                META-INF/
diff --git a/sandbox/org.eclipse.papyrus.test.common/documentation.pdoc b/sandbox/org.eclipse.papyrus.test.common/documentation.pdoc
deleted file mode 100644
index 5e8b1ef0cbd..00000000000
--- a/sandbox/org.eclipse.papyrus.test.common/documentation.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides useful methods for JUnit test.&#xD;&#xA;I think, it should provide any Papyrus tests.">
-  <referent firstName="Vincent" lastName="Lorenzo" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA-LIST"/>
-</doc:Documentation>
diff --git a/sandbox/org.eclipse.papyrus.test.common/plugin.properties b/sandbox/org.eclipse.papyrus.test.common/plugin.properties
index bebf8acd297..68d768dc512 100644
--- a/sandbox/org.eclipse.papyrus.test.common/plugin.properties
+++ b/sandbox/org.eclipse.papyrus.test.common/plugin.properties
@@ -1,3 +1,4 @@
 #Properties file for org.eclipse.papyrus.test.common
 providerName = Eclipse Modeling Project
-pluginName = Common plugin for JUnit Tests
-\ No newline at end of file
+pluginName = Common plugin for JUnit Tests
+pluginDescription=This plugin provides useful methods for JUnit test.&#xD;&#xA;I think, it should provide any Papyrus tests.
+\ No newline at end of file
diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/META-INF/MANIFEST.MF b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/META-INF/MANIFEST.MF
index cf99194c159..0cb38c12b17 100644
--- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/META-INF/MANIFEST.MF
@@ -31,4 +31,4 @@ Import-Package: com.google.common.base;version="10.0.1",
  com.google.common.collect;version="10.0.1",
  com.google.common.io;version="10.0.1"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-
+Bundle-Description: %pluginDescription
diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/plugin.pdoc b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/plugin.pdoc
deleted file mode 100644
index b925a00bd31..00000000000
--- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="Automated tests for the CDO Integration core APIs and implementation.">
-  <referent firstName="Christian" lastName="Damus" eMail="give.a.damus@gmail.com" currentCompany="(independent committer)"/>
-</doc:Documentation>
diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/plugin.properties b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/plugin.properties
index f984f57b278..5db8cfc1f2d 100644
--- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/plugin.properties
+++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.core.tests/plugin.properties
@@ -11,3 +11,5 @@
 
 pluginName = Papyrus CDO Model Repository Core Tests (Incubation)
 providerName = Eclipse Modeling Project
+
+pluginDescription=Automated tests for the CDO Integration core APIs and implementation.
+\ No newline at end of file
diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.tests/META-INF/MANIFEST.MF b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.tests/META-INF/MANIFEST.MF
index caffc86e13a..454fb9c6e01 100644
--- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.tests/META-INF/MANIFEST.MF
@@ -12,4 +12,4 @@ Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.cdo.tests
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-
+Bundle-Description: %pluginDescription
diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.tests/plugin.pdoc b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.tests/plugin.pdoc
deleted file mode 100644
index d351cac067e..00000000000
--- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.tests/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="Master automated test suite for the CDO Integration feature.">
-  <referent firstName="Christian" lastName="Damus" eMail="give.a.damus@gmail.com" currentCompany="(independent committer)"/>
-</doc:Documentation>
diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.tests/plugin.properties b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.tests/plugin.properties
index a78307dc570..792f6d7b4be 100644
--- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.tests/plugin.properties
+++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.tests/plugin.properties
@@ -11,3 +11,5 @@
 
 pluginName = Papyrus CDO Model Repository All Tests (Incubation)
 providerName = Eclipse Modeling Project
+
+pluginDescription=Master automated test suite for the CDO Integration feature.
+\ No newline at end of file
diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.tests/META-INF/MANIFEST.MF b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.tests/META-INF/MANIFEST.MF
index a9189b26eae..a0cfcbe7e3b 100644
--- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.tests/META-INF/MANIFEST.MF
@@ -34,4 +34,4 @@ Import-Package: com.google.common.base;version="10.0.1",
  com.google.common.cache;version="10.0.1",
  com.google.common.collect;version="10.0.1"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-
+Bundle-Description: %pluginDescription
diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.tests/plugin.pdoc b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.tests/plugin.pdoc
deleted file mode 100644
index 197491ce05b..00000000000
--- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.tests/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="Automated tests for the CDO Integration user interface core.">
-  <referent firstName="Christian" lastName="Damus" eMail="give.a.damus@gmail.com" currentCompany="(independent committer)"/>
-</doc:Documentation>
diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.tests/plugin.properties b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.tests/plugin.properties
index 1af1ce5c2f7..6d9473e2e31 100644
--- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.tests/plugin.properties
+++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.ui.tests/plugin.properties
@@ -11,3 +11,5 @@
 
 pluginName = Papyrus CDO Model Repository UI Tests (Incubation)
 providerName = Eclipse Modeling Project
+
+pluginDescription=Automated tests for the CDO Integration user interface core.
+\ No newline at end of file
diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/META-INF/MANIFEST.MF b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/META-INF/MANIFEST.MF
index c3e53254d3a..a516d532d0f 100644
--- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/META-INF/MANIFEST.MF
@@ -18,4 +18,4 @@ Bundle-SymbolicName: org.eclipse.papyrus.cdo.uml.search.ui.tests
 Import-Package: com.google.common.base;version="10.0.1",
  com.google.common.collect;version="10.0.1"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-
+Bundle-Description: %pluginDescription
diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/plugin.pdoc b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/plugin.pdoc
deleted file mode 100644
index a73a9f9aad2..00000000000
--- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="Automated tests for the CDO Integration search implementation.">
-  <referent firstName="Christian" lastName="Damus" eMail="give.a.damus@gmail.com" currentCompany="(independent committer)"/>
-</doc:Documentation>
diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/plugin.properties b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/plugin.properties
index c403fb5a761..445fca63f83 100644
--- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/plugin.properties
+++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.search.ui.tests/plugin.properties
@@ -11,3 +11,5 @@
 
 pluginName = Papyrus CDO UML Search UI Tests (Incubation)
 providerName = Eclipse Modeling Project
+
+pluginDescription=Automated tests for the CDO Integration search implementation.
+\ No newline at end of file
diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui.tests/META-INF/MANIFEST.MF b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui.tests/META-INF/MANIFEST.MF
index 9a446815966..faa82a3ae66 100644
--- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui.tests/META-INF/MANIFEST.MF
@@ -18,4 +18,4 @@ Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.cdo.uml.ui.tests
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-
+Bundle-Description: %pluginDescription
diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui.tests/plugin.pdoc b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui.tests/plugin.pdoc
deleted file mode 100644
index 42b12691e7f..00000000000
--- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui.tests/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="Automated tests for the CDO Integration UML-specific user interface extensions.">
-  <referent firstName="Christian" lastName="Damus" eMail="give.a.damus@gmail.com" currentCompany="(independent committer)"/>
-</doc:Documentation>
diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui.tests/plugin.properties b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui.tests/plugin.properties
index b4243c5cf8c..c9d24b3d543 100644
--- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui.tests/plugin.properties
+++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.uml.ui.tests/plugin.properties
@@ -11,3 +11,5 @@
 
 pluginName = Papyrus CDO UML UI Tests (Incubation)
 providerName = Eclipse Modeling Project
+
+pluginDescription=Automated tests for the CDO Integration UML-specific user interface extensions.
+\ No newline at end of file
diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/META-INF/MANIFEST.MF b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/META-INF/MANIFEST.MF
index a28c350812c..206c84d6586 100644
--- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/META-INF/MANIFEST.MF
@@ -20,4 +20,4 @@ Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.papyrus.cdo.validation.problems.tests
  ;singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-
+Bundle-Description: %pluginDescription
diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/plugin.pdoc b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/plugin.pdoc
deleted file mode 100644
index e94709fae94..00000000000
--- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="Automated tests for the CDO model validation problems model.">
-  <referent firstName="Christian" lastName="Damus" eMail="give.a.damus@gmail.com" currentCompany="(independent committer)"/>
-</doc:Documentation>
diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/plugin.properties b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/plugin.properties
index 2c7db5186c5..4b57c313691 100644
--- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/plugin.properties
+++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/plugin.properties
@@ -11,3 +11,5 @@
 
 pluginName = Papyrus CDO Model Repository Problems Model Tests (Incubation)
 providerName = Eclipse Modeling Project
+
+pluginDescription=Automated tests for the CDO model validation problems model.
+\ No newline at end of file
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.file.tests/META-INF/MANIFEST.MF b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.file.tests/META-INF/MANIFEST.MF
index b769e464368..12afe8bbdd8 100644
--- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.file.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.file.tests/META-INF/MANIFEST.MF
@@ -21,4 +21,4 @@ Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.uml.compare.file.tests.Activator
 Bundle-SymbolicName: org.eclipse.papyrus.uml.compare.file.tests
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
+Bundle-Description: %pluginDescription
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.file.tests/build.properties b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.file.tests/build.properties
index 234ccfaa54e..eccac6415db 100644
--- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.file.tests/build.properties
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.file.tests/build.properties
@@ -5,7 +5,6 @@ bin.includes = META-INF/,\
                OSGI-INF/,\
                about.html,\
                build.properties,\
-               plugin.pdoc,\
                resources/,\
                src/
 src.includes = about.html
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.file.tests/plugin.pdoc b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.file.tests/plugin.pdoc
deleted file mode 100644
index 7c1510f6e9a..00000000000
--- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.file.tests/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides tests for the plugin org.eclipse.papyrus.uml.compare.file">
-  <referent firstName="vincent" lastName="lorenzo" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA-LIST"/>
-</doc:Documentation>
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.file.tests/plugin.properties b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.file.tests/plugin.properties
new file mode 100644
index 00000000000..f0667651b66
--- /dev/null
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.file.tests/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+# Copyright (c) 2015 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
+##################################################################################)
+
+pluginDescription=This plugin provides tests for the plugin org.eclipse.papyrus.uml.compare.file
+\ No newline at end of file
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.tests/META-INF/MANIFEST.MF b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.tests/META-INF/MANIFEST.MF
index d6a2a55e9db..d35c3d77640 100644
--- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.tests/META-INF/MANIFEST.MF
@@ -24,4 +24,4 @@ Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.uml.compare.tests.Activator
 Bundle-SymbolicName: org.eclipse.papyrus.uml.compare.tests
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
+Bundle-Description: %pluginDescription
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.tests/build.properties b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.tests/build.properties
index 4919375fb1f..1aa49b13f58 100644
--- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.tests/build.properties
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.tests/build.properties
@@ -5,7 +5,6 @@ bin.includes = META-INF/,\
                OSGI-INF/,\
                about.html,\
                build.properties,\
-               plugin.pdoc,\
                src/,\
                resources/
 src.includes = about.html
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.tests/plugin.pdoc b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.tests/plugin.pdoc
deleted file mode 100644
index 413bb270926..00000000000
--- a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.tests/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides tests for the plugin org.eclipse.papyrus.uml.compare">
-  <referent firstName="vincent" lastName="lorenzo" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA-LIST"/>
-</doc:Documentation>
diff --git a/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.tests/plugin.properties b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.tests/plugin.properties
new file mode 100644
index 00000000000..aada3ea9267
--- /dev/null
+++ b/tests/junit/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.tests/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+# Copyright (c) 2015 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
+##################################################################################)
+
+pluginDescription=This plugin provides tests for the plugin org.eclipse.papyrus.uml.compare
+\ No newline at end of file
diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/META-INF/MANIFEST.MF
index 496d5b00c07..ee79e41565c 100644
--- a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/META-INF/MANIFEST.MF
@@ -17,4 +17,4 @@ Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.bundles.tests.Activator
 Bundle-SymbolicName: org.eclipse.papyrus.bundles.tests
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-
+Bundle-Description: %pluginDescription
diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/build.properties b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/build.properties
index 0851fdb8fab..dfc79e0933b 100644
--- a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/build.properties
+++ b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/build.properties
@@ -4,6 +4,5 @@ bin.includes = META-INF/,\
                .,\
                OSGI-INF/,\
                about.html,\
-               plugin.pdoc,\
                build.properties
 src.includes = about.html
diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/plugin.pdoc b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/plugin.pdoc
deleted file mode 100644
index 97c93dc91bf..00000000000
--- a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin allows to tests some informations on the installed plugins : &#xD;&#xA;&#x9;- providername&#xD;&#xA;&#x9;- version number&#xD;&#xA;&#x9;- Incubation&#xD;&#xA;...">
-  <referent firstName="vincent" lastName="lorenzo" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA-LIST"/>
-</doc:Documentation>
diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/plugin.properties b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/plugin.properties
new file mode 100644
index 00000000000..0b6ef86997c
--- /dev/null
+++ b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+# Copyright (c) 2015 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
+##################################################################################)
+
+pluginDescription=This plugin allows to tests some informations on the installed plugins : - providername - version number - Incubation ...
+\ No newline at end of file
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/META-INF/MANIFEST.MF
index e4598cb97f2..9ba1af9446a 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/META-INF/MANIFEST.MF
@@ -19,4 +19,4 @@ Bundle-Activator: org.eclipse.papyrus.infra.nattable.model.editor.test
 Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.model.editor.t
  ests
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-
+Bundle-Description: %pluginDescription
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/build.properties b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/build.properties
index 51ac1bdb6d3..750b1c3be21 100644
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/build.properties
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/build.properties
@@ -3,7 +3,6 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                OSGI-INF/,\
-               plugin.pdoc,\
                resources/,\
                about.html,\
                org.eclipse.papyrus.infra.nattable.model.editor.tests.launch
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/plugin.pdoc b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/plugin.pdoc
deleted file mode 100644
index c1fca7aba51..00000000000
--- a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides tests for the EMF Editor for TableConfiguration (and others editor).&#xD;&#xA;We override the generated editor to ensure the serialization of the type of the elements. &#xD;&#xA;$The main goal of the tests provided by this plugin is to verofy that we use our editor and not the editor generated by EMF.">
-  <referent firstName="Vincent" lastName="LORENZO" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/plugin.properties b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/plugin.properties
new file mode 100644
index 00000000000..7e999de3d16
--- /dev/null
+++ b/tests/junit/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model.editor.tests/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+# Copyright (c) 2015 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
+##################################################################################)
+
+pluginDescription=This plugin provides tests for the EMF Editor for TableConfiguration (and others editor). We override the generated editor to ensure the serialization of the type of the elements. &#xD;&#xA;$The main goal of the tests provided by this plugin is to verofy that we use our editor and not the editor generated by EMF.
+\ No newline at end of file
diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/META-INF/MANIFEST.MF b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/META-INF/MANIFEST.MF
index 7df24de1376..44217fe01a5 100644
--- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/META-INF/MANIFEST.MF
@@ -1,39 +1,39 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources;bundle-version="3.8.0",
- org.eclipse.jdt.ui,
- org.eclipse.papyrus.views.modelexplorer;bundle-version="1.1.0",
- org.eclipse.ui.navigator,
- org.eclipse.ui.views.properties.tabbed,
- org.eclipse.ui.ide;bundle-version="3.8.0",
- org.eclipse.emf.edit;bundle-version="2.8.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",
- org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",
- org.eclipse.papyrus.editor;bundle-version="1.1.0",
- org.junit;bundle-version="4.10.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",
- com.google.guava;bundle-version="11.0.0",
- org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",
- org.eclipse.e4.ui.workbench;bundle-version="1.1.0",
- org.eclipse.e4.ui.model.workbench;bundle-version="1.1.0",
- org.eclipse.e4.core.contexts;bundle-version="1.3.0",
- org.eclipse.papyrus.junit.framework;bundle-version="1.1.0"
-Export-Package: org.eclipse.papyrus.junit.matchers,
- org.eclipse.papyrus.junit.utils,
- org.eclipse.papyrus.junit.utils.resources,
- org.eclipse.papyrus.junit.utils.rules,
- org.eclipse.papyrus.junit.utils.tests
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.1.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.junit.utils.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.junit.utils
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-
+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.core.resources;bundle-version="3.8.0",
+ org.eclipse.jdt.ui,
+ org.eclipse.papyrus.views.modelexplorer;bundle-version="1.1.0",
+ org.eclipse.ui.navigator,
+ org.eclipse.ui.views.properties.tabbed,
+ org.eclipse.ui.ide;bundle-version="3.8.0",
+ org.eclipse.emf.edit;bundle-version="2.8.0",
+ org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.widgets;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.1.0",
+ org.eclipse.papyrus.uml.tools;bundle-version="1.1.0",
+ org.eclipse.papyrus.editor;bundle-version="1.1.0",
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.tools;bundle-version="1.1.0",
+ org.eclipse.papyrus.infra.emf;bundle-version="1.1.0",
+ com.google.guava;bundle-version="11.0.0",
+ org.eclipse.papyrus.infra.nattable.model;bundle-version="1.1.0",
+ org.eclipse.e4.ui.workbench;bundle-version="1.1.0",
+ org.eclipse.e4.ui.model.workbench;bundle-version="1.1.0",
+ org.eclipse.e4.core.contexts;bundle-version="1.3.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.1.0"
+Export-Package: org.eclipse.papyrus.junit.matchers,
+ org.eclipse.papyrus.junit.utils,
+ org.eclipse.papyrus.junit.utils.resources,
+ org.eclipse.papyrus.junit.utils.rules,
+ org.eclipse.papyrus.junit.utils.tests
+Bundle-Vendor: %Bundle-Vendor
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.1.0.qualifier
+Bundle-Name: %Bundle-Name
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.junit.utils.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.junit.utils
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-Description: %pluginDescription
diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/build.properties b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/build.properties
index 0851fdb8fab..dfc79e0933b 100644
--- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/build.properties
+++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/build.properties
@@ -4,6 +4,5 @@ bin.includes = META-INF/,\
                .,\
                OSGI-INF/,\
                about.html,\
-               plugin.pdoc,\
                build.properties
 src.includes = about.html
diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/plugin.pdoc b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/plugin.pdoc
deleted file mode 100644
index c818cf6c315..00000000000
--- a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides useful methods for the JUnit tests">
-  <referent firstName="vincent" lastName="lorenzo" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA-LIST"/>
-</doc:Documentation>
diff --git a/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/plugin.properties b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/plugin.properties
new file mode 100644
index 00000000000..57cdbe5fa4b
--- /dev/null
+++ b/tests/junit/plugins/junit/org.eclipse.papyrus.junit.utils/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+# Copyright (c) 2015 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
+##################################################################################)
+
+pluginDescription=This plugin provides useful methods for the JUnit tests
+\ No newline at end of file
diff --git a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/META-INF/MANIFEST.MF
index 16399e32d03..8ab5a3e4606 100644
--- a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/META-INF/MANIFEST.MF
@@ -40,4 +40,4 @@ Bundle-Activator: org.eclipse.papyrus.sysml.nattable.requirement.tests
  .Activator
 Bundle-SymbolicName: org.eclipse.papyrus.sysml.nattable.requirement.tests;singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-
+Bundle-Description: %pluginDescription
diff --git a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/build.properties b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/build.properties
index 5cec5fa3697..4b57c62ef35 100644
--- a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/build.properties
+++ b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/build.properties
@@ -4,7 +4,6 @@ bin.includes = META-INF/,\
                .,\
                OSGI-INF/,\
                about.html,\
-               plugin.pdoc,\
                resources/,\
                SysMLNatTableRequirementTests.launch,\
                plugin.properties
diff --git a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/plugin.pdoc b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/plugin.pdoc
deleted file mode 100644
index eef11c221a6..00000000000
--- a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin tests the plugin org.eclipse.papyrus.sysml.nattable.requirement">
-  <referent firstName="vincent" lastName="lorenzo" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA-LIST"/>
-</doc:Documentation>
diff --git a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/plugin.properties b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/plugin.properties
index 43c9ef92d3e..fe9ce29cb18 100644
--- a/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/plugin.properties
+++ b/tests/junit/plugins/sysml/nattable/org.eclipse.papyrus.sysml.nattable.requirement.tests/plugin.properties
@@ -10,3 +10,5 @@
 ###############################################################################
 pluginName=Requirement diagram tests
 providerName=Eclipse Modeling Project
+
+pluginDescription=This plugin tests the plugin org.eclipse.papyrus.sysml.nattable.requirement
+\ No newline at end of file
diff --git a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/META-INF/MANIFEST.MF
index fb5cd50b6c3..430d5a1b848 100644
--- a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/META-INF/MANIFEST.MF
@@ -32,4 +32,4 @@ Bundle-Activator: org.eclipse.papyrus.uml.modelexplorer.tests.Activato
  r
 Bundle-SymbolicName: org.eclipse.papyrus.uml.modelexplorer.tests
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
+Bundle-Description: %pluginDescription
diff --git a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/plugin.pdoc b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/plugin.pdoc
deleted file mode 100644
index 1a819c7e951..00000000000
--- a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin allows to tests the plugin org.eclipse.papyrus.uml.modelexplorer">
-  <referent firstName="vincent" lastName="lorenzo" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA-LIST"/>
-</doc:Documentation>
diff --git a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/plugin.properties b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/plugin.properties
index b2eb1858763..0a213aca78f 100644
--- a/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/plugin.properties
+++ b/tests/junit/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.tests/plugin.properties
@@ -1,3 +1,4 @@
 #Properties file for org.eclipse.papyrus.uml.modelexplorer.tests
 providerName = Eclipse Modeling Project
-pluginName = JUnit Tests for uml ModelExplorer
-\ No newline at end of file
+pluginName = JUnit Tests for uml ModelExplorer
+pluginDescription=This plugin allows to tests the plugin org.eclipse.papyrus.uml.modelexplorer
+\ No newline at end of file
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/META-INF/MANIFEST.MF
index 3530cdc8a3f..6e922c3e93b 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/META-INF/MANIFEST.MF
@@ -21,4 +21,4 @@ Bundle-ManifestVersion: 2
 Bundle-Activator: org.eclipse.papyrus.uml.nattable.tests.Activator
 Bundle-SymbolicName: org.eclipse.papyrus.uml.nattable.tests
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
+Bundle-Description: %pluginDescription
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/build.properties b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/build.properties
index ea1337a4a04..0a66ecb90f8 100644
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/build.properties
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/build.properties
@@ -5,6 +5,5 @@ bin.includes = META-INF/,\
                resources/,\
                OSGI-INF/,\
                about.html,\
-               plugin.pdoc,\
                UMLNattableAllTests.launch
 src.includes = about.html
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/plugin.pdoc b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/plugin.pdoc
deleted file mode 100644
index 94ff27602e7..00000000000
--- a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides test for org.eclipse.papyrus.uml.nattable">
-  <referent firstName="vincent" lastName="lorenzo" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA-LIST"/>
-</doc:Documentation>
diff --git a/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/plugin.properties b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/plugin.properties
new file mode 100644
index 00000000000..b8a50958722
--- /dev/null
+++ b/tests/junit/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.tests/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+# Copyright (c) 2015 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - initial API and implementation
+##################################################################################)
+
+pluginDescription=This plugin provides test for org.eclipse.papyrus.uml.nattable
+\ No newline at end of file
diff --git a/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/META-INF/MANIFEST.MF
index 037600f47de..89e2ba284c7 100644
--- a/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/META-INF/MANIFEST.MF
@@ -35,4 +35,4 @@ Bundle-Activator: org.eclipse.papyrus.views.modelexplorer.tests.Activa
  tor
 Bundle-SymbolicName: org.eclipse.papyrus.views.modelexplorer.tests
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-
+Bundle-Description: %pluginDescription
diff --git a/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/build.properties b/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/build.properties
index 656628647c0..b95796dd9dc 100644
--- a/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/build.properties
+++ b/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/build.properties
@@ -4,7 +4,6 @@ bin.includes = META-INF/,\
                .,\
                plugin.properties,\
                about.html,\
-               plugin.pdoc,\
                resources/,\
                build.properties
 src.includes = about.html
diff --git a/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/plugin.pdoc b/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/plugin.pdoc
deleted file mode 100644
index e86e1decbce..00000000000
--- a/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/plugin.pdoc
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation" description="This plugin provides tests for the ModelExplorer View : org.eclispe.papyrus.views.modelexplorer">
-  <referent firstName="Vincent" lastName="Lorenzo" eMail="vincent.lorenzo@cea.fr" currentCompany="CEA-LIST"/>
-</doc:Documentation>
diff --git a/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/plugin.properties b/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/plugin.properties
index 0072f75b8ed..8b7803982f6 100644
--- a/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/plugin.properties
+++ b/tests/junit/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer.tests/plugin.properties
@@ -1,3 +1,4 @@
 #Properties file for org.eclipse.papyrus.views.modelexplorer.tests
 providerName = Eclipse Modeling Project
-pluginName = Tests for ModelExplorer
-\ No newline at end of file
+pluginName = Tests for ModelExplorer
+pluginDescription=This plugin provides tests for the ModelExplorer View : org.eclispe.papyrus.views.modelexplorer
+\ No newline at end of file
diff --git a/tests/recipes/extraplugins/uml/revision/org.eclipse.papyrus.revisiontool.test/META-INF/MANIFEST.MF b/tests/recipes/extraplugins/uml/revision/org.eclipse.papyrus.revisiontool.test/META-INF/MANIFEST.MF
index cb1a3a8f589..883cf5b0a8a 100644
--- a/tests/recipes/extraplugins/uml/revision/org.eclipse.papyrus.revisiontool.test/META-INF/MANIFEST.MF
+++ b/tests/recipes/extraplugins/uml/revision/org.eclipse.papyrus.revisiontool.test/META-INF/MANIFEST.MF
@@ -1,10 +1,11 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
+Bundle-Description: %pluginDescription
 Bundle-SymbolicName: org.eclipse.papyrus.revisiontool.test
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.revisiontool.test.Activator
-Require-Bundle: org.eclipse.ui,
+Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
diff --git a/tests/recipes/extraplugins/uml/revision/org.eclipse.papyrus.revisiontool.test/plugin.pdoc b/tests/recipes/extraplugins/uml/revision/org.eclipse.papyrus.revisiontool.test/plugin.pdoc
deleted file mode 100644
index 27af3202b45..00000000000
--- a/tests/recipes/extraplugins/uml/revision/org.eclipse.papyrus.revisiontool.test/plugin.pdoc
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc:Documentation
-    xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI"
-    xmlns:doc="http://www.eclipse.org/papyrus/documentation/plugin/documentation"
-    description="The goal of this plugin is to test functionality about revision of model">
-  <referent
-      firstName="Patrick"
-      lastName="Tessier"
-      eMail="patrick.tessier@cea.fr"
-      currentCompany="CEA LIST"/>
-</doc:Documentation>
diff --git a/tests/recipes/extraplugins/uml/revision/org.eclipse.papyrus.revisiontool.test/plugin.properties b/tests/recipes/extraplugins/uml/revision/org.eclipse.papyrus.revisiontool.test/plugin.properties
index e59f362c86f..a289371c202 100644
--- a/tests/recipes/extraplugins/uml/revision/org.eclipse.papyrus.revisiontool.test/plugin.properties
+++ b/tests/recipes/extraplugins/uml/revision/org.eclipse.papyrus.revisiontool.test/plugin.properties
@@ -10,3 +10,5 @@
 ##################################################################################
 pluginName=Revision Tool test
 providerName=Eclipse Modeling Project
+
+pluginDescription=The goal of this plugin is to test functionality about revision of model
+\ No newline at end of file
author	Benoit Maggi	2015-01-19 09:57:41 +0000
committer	Benoit Maggi	2015-02-17 15:03:48 +0000
commit	6db3a2d44215b4d5f3d3ce3c8efaa1c435c9cc0f (patch)
tree	09857014032c0a765b415c3b8d5840f20d0cd896
parent	ada1991844d16d1a7e989d4a419b533b060dc1c9 (diff)
download	org.eclipse.papyrus-6db3a2d44215b4d5f3d3ce3c8efaa1c435c9cc0f.tar.gz org.eclipse.papyrus-6db3a2d44215b4d5f3d3ce3c8efaa1c435c9cc0f.tar.xz org.eclipse.papyrus-6db3a2d44215b4d5f3d3ce3c8efaa1c435c9cc0f.zip