Bug 518452 - [Releng] [Photon] Amend the new Toolsmith releng process

- Add a new buildafter script for the next toolsmiths release
- Correct missed dev references
- Wire the toolsmith plugins to the toolsmith build

Change-Id: Ie4fc56fd9526ecd24597733b7ab5bc6a7a9b9d42
Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>

54 files changed, 63 insertions, 24 deletions

diff --git a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/pom.xml b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/pom.xml
index 185e981aaf9..17bed7f164a 100644
--- a/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/pom.xml
+++ b/plugins/infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties/pom.xml
@@ -2,10 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
+	<!-- This plugin is not released ouside of the Toolsmith feature and therefore must be part of the toolsmith build -->
 	<parent>
 		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.infra-emf</artifactId>
+    	<artifactId>org.eclipse.papyrus-toolsmiths</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
+		<relativePath>../../../toolsmiths/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.emf.types.ui.properties</artifactId>
 	<version>3.0.0-SNAPSHOT</version>
diff --git a/plugins/infra/emf/pom.xml b/plugins/infra/emf/pom.xml
index 35a726fb1c3..c929f6fa29d 100644
--- a/plugins/infra/emf/pom.xml
+++ b/plugins/infra/emf/pom.xml
@@ -20,7 +20,7 @@
 		<module>org.eclipse.papyrus.infra.ui.emf</module>
 		<module>org.eclipse.papyrus.infra.emf.types</module>
 		<module>org.eclipse.papyrus.infra.emf.types.ui</module>
-		<module>org.eclipse.papyrus.infra.emf.types.ui.properties</module>
+		
 		<module>expressions</module>
 	</modules>
 </project>
diff --git a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/pom.xml b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/pom.xml
index 6a03ad4c4c3..94630c94d4a 100644
--- a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/pom.xml
+++ b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/pom.xml
@@ -2,10 +2,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
+	
+	<!-- This plugin is not released ouside of the Toolsmith feature and therefore must be part of the toolsmith build -->
 	<parent>
 		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.infra.gmfdiag-expansion</artifactId>
+    	<artifactId>org.eclipse.papyrus-toolsmiths</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
+		<relativePath>../../../../toolsmiths/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.expansion.edit</artifactId>
 	<version>2.0.0-SNAPSHOT</version>
diff --git a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/pom.xml b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/pom.xml
index b4925590426..494c599278d 100644
--- a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/pom.xml
+++ b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/pom.xml
@@ -2,10 +2,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
+	
+	<!-- This plugin is not released ouside of the Toolsmith feature and therefore must be part of the toolsmith build -->
 	<parent>
 		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.infra.gmfdiag-expansion</artifactId>
+    	<artifactId>org.eclipse.papyrus-toolsmiths</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
+		<relativePath>../../../../toolsmiths/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.expansion.editor</artifactId>
 	<version>2.0.0-SNAPSHOT</version>
diff --git a/plugins/infra/gmfdiag/expansion/pom.xml b/plugins/infra/gmfdiag/expansion/pom.xml
index a4383a82385..796fc39a85e 100644
--- a/plugins/infra/gmfdiag/expansion/pom.xml
+++ b/plugins/infra/gmfdiag/expansion/pom.xml
@@ -14,7 +14,7 @@
 
 	<modules>
 		<module>org.eclipse.papyrus.infra.gmfdiag.expansion</module>
-		<module>org.eclipse.papyrus.infra.gmfdiag.expansion.edit</module>
-		<module>org.eclipse.papyrus.infra.gmfdiag.expansion.editor</module>
+		
+		
 	</modules>
 </project>
diff --git a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/pom.xml b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/pom.xml
index b0fc00ef1d7..2ef40318029 100644
--- a/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/pom.xml
+++ b/plugins/infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor/pom.xml
@@ -2,10 +2,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
+	
+	<!-- This plugin is not released ouside of the Toolsmith feature and therefore must be part of the toolsmith build -->
 	<parent>
 		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.infra.gmfdiag-paletteconfiguration</artifactId>
+    	<artifactId>org.eclipse.papyrus-toolsmiths</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
+		<relativePath>../../../../toolsmiths/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor</artifactId>
 	<version>3.1.1-SNAPSHOT</version>
diff --git a/plugins/infra/gmfdiag/paletteconfiguration/pom.xml b/plugins/infra/gmfdiag/paletteconfiguration/pom.xml
index a0afc18259d..b8f219482f5 100644
--- a/plugins/infra/gmfdiag/paletteconfiguration/pom.xml
+++ b/plugins/infra/gmfdiag/paletteconfiguration/pom.xml
@@ -15,6 +15,6 @@
 	<modules>
 		<module>org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration</module>
 		<module>org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit</module>
-		<module>org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor</module>
+		
 	</modules>
 </project>
diff --git a/plugins/infra/nattable/pom.xml b/plugins/infra/nattable/pom.xml
index c0246c799bd..14be66ceeeb 100755
--- a/plugins/infra/nattable/pom.xml
+++ b/plugins/infra/nattable/pom.xml
@@ -22,7 +22,6 @@
 		<module>org.eclipse.papyrus.infra.nattable.model.edit</module>
 		<module>org.eclipse.papyrus.infra.nattable.model.editor</module>
 		<module>org.eclipse.papyrus.infra.nattable.modelexplorer</module>
-		<module>org.eclipse.papyrus.customization.nattableconfiguration</module>
 		<module>org.eclipse.papyrus.infra.nattable.properties</module>
 		<module>org.eclipse.papyrus.infra.nattable.views.config</module>
 		<module>org.eclipse.papyrus.infra.nattable.views.editor</module>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/.classpath b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/.classpath
index eca7bdba8f0..eca7bdba8f0 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/.classpath
+++ b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/.classpath
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/.project b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/.project
index 33cf5be93ed..33cf5be93ed 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/.project
+++ b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/.project
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/.settings/org.eclipse.core.resources.prefs b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/.settings/org.eclipse.core.resources.prefs
index 896a9a53a53..896a9a53a53 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/.settings/org.eclipse.core.runtime.prefs b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/.settings/org.eclipse.core.runtime.prefs
index 5a0ad22d2a7..5a0ad22d2a7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/.settings/org.eclipse.core.runtime.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/.settings/org.eclipse.core.runtime.prefs
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/.settings/org.eclipse.jdt.core.prefs
index 8ddd9a88d57..8ddd9a88d57 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/.settings/org.eclipse.jdt.ui.prefs b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/.settings/org.eclipse.pde.api.tools.prefs b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/.settings/org.eclipse.pde.api.tools.prefs
index b2260f87129..b2260f87129 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/.settings/org.eclipse.pde.api.tools.prefs
+++ b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/META-INF/MANIFEST.MF
index be29057878f..be29057878f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/META-INF/MANIFEST.MF
+++ b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/META-INF/MANIFEST.MF
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/OSGI-INF/l10n/bundle.properties b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/OSGI-INF/l10n/bundle.properties
index ad72e5822fa..ad72e5822fa 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/OSGI-INF/l10n/bundle.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/OSGI-INF/l10n/bundle.properties
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/about.html b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/about.html
index 598b3684879..598b3684879 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/about.html
+++ b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/about.html
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/build.properties b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/build.properties
index c68a0b3eaaa..c68a0b3eaaa 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/build.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/build.properties
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/icons/papyrusNattableconfigurationWizban.png b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/icons/papyrusNattableconfigurationWizban.png
index 35da2fed4ce..35da2fed4ce 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/icons/papyrusNattableconfigurationWizban.png
+++ b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/icons/papyrusNattableconfigurationWizban.png
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/icons/wizard_icon.png b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/icons/wizard_icon.png
index 9e5fd4be268..9e5fd4be268 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/icons/wizard_icon.png
+++ b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/icons/wizard_icon.png
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/plugin.properties b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/plugin.properties
index 3398a6e0563..3398a6e0563 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/plugin.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/plugin.properties
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/plugin.xml b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/plugin.xml
index 926e846ebf4..926e846ebf4 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/plugin.xml
+++ b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/plugin.xml
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/pom.xml b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/pom.xml
index 91d8a643636..59cec974905 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/pom.xml
+++ b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/pom.xml
@@ -3,7 +3,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>org.eclipse.papyrus.infra-nattable</artifactId>
+		<artifactId>org.eclipse.papyrus-toolsmiths</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/Activator.java b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/Activator.java
index 347b9c03825..347b9c03825 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/Activator.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/Activator.java
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/edition/FeatureFillingConfigurationDialog.java b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/edition/FeatureFillingConfigurationDialog.java
index 201fa84b58b..201fa84b58b 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/edition/FeatureFillingConfigurationDialog.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/edition/FeatureFillingConfigurationDialog.java
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/edition/PasteEObjectConfigurationDialog.java b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/edition/PasteEObjectConfigurationDialog.java
index 032c7cfa743..032c7cfa743 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/edition/PasteEObjectConfigurationDialog.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/edition/PasteEObjectConfigurationDialog.java
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/edition/TreeFillingConfigurationDialog.java b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/edition/TreeFillingConfigurationDialog.java
index f85f7110e01..f85f7110e01 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/edition/TreeFillingConfigurationDialog.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/edition/TreeFillingConfigurationDialog.java
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/handlers/EditExistingTableConfigurationWizardHandler.java b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/handlers/EditExistingTableConfigurationWizardHandler.java
index d227167e975..d227167e975 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/handlers/EditExistingTableConfigurationWizardHandler.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/handlers/EditExistingTableConfigurationWizardHandler.java
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/helper/TableConfigurationHelper.java b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/helper/TableConfigurationHelper.java
index 2009a0140d5..2009a0140d5 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/helper/TableConfigurationHelper.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/helper/TableConfigurationHelper.java
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/messages/Messages.java b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/messages/Messages.java
index acfa52dcd37..acfa52dcd37 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/messages/Messages.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/messages/Messages.java
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/messages/messages.properties b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/messages/messages.properties
index e605462faa8..e605462faa8 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/messages/messages.properties
+++ b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/messages/messages.properties
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/pages/AbstractAxisConfigurationWizardPage.java b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/pages/AbstractAxisConfigurationWizardPage.java
index d51d78f31ed..d51d78f31ed 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/pages/AbstractAxisConfigurationWizardPage.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/pages/AbstractAxisConfigurationWizardPage.java
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/pages/AbstractTableConfigurationWizardPage.java b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/pages/AbstractTableConfigurationWizardPage.java
index 4940dbdd707..4940dbdd707 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/pages/AbstractTableConfigurationWizardPage.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/pages/AbstractTableConfigurationWizardPage.java
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/pages/ColumnConfigurationWizardPage.java b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/pages/ColumnConfigurationWizardPage.java
index cebd62382f5..cebd62382f5 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/pages/ColumnConfigurationWizardPage.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/pages/ColumnConfigurationWizardPage.java
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/pages/EditGenericNattableConfigurationFieldsNattableWizardPage.java b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/pages/EditGenericNattableConfigurationFieldsNattableWizardPage.java
index 29630976bac..29630976bac 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/pages/EditGenericNattableConfigurationFieldsNattableWizardPage.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/pages/EditGenericNattableConfigurationFieldsNattableWizardPage.java
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/pages/NattableConfigurationFileCreationPage.java b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/pages/NattableConfigurationFileCreationPage.java
index 724197a3e1d..724197a3e1d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/pages/NattableConfigurationFileCreationPage.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/pages/NattableConfigurationFileCreationPage.java
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/pages/RowConfigurationWizardPage.java b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/pages/RowConfigurationWizardPage.java
index 2503ab14585..2503ab14585 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/pages/RowConfigurationWizardPage.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/pages/RowConfigurationWizardPage.java
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/pages/SlaveConfigurationWizardPage.java b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/pages/SlaveConfigurationWizardPage.java
index 29fb6106cfd..29fb6106cfd 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/pages/SlaveConfigurationWizardPage.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/pages/SlaveConfigurationWizardPage.java
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/utils/NameSimplifier.java b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/utils/NameSimplifier.java
index 9ea3e49424e..9ea3e49424e 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/utils/NameSimplifier.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/utils/NameSimplifier.java
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/utils/NattableConfigurationConstants.java b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/utils/NattableConfigurationConstants.java
index aaa7c6e7961..aaa7c6e7961 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/utils/NattableConfigurationConstants.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/utils/NattableConfigurationConstants.java
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/utils/NattableConfigurationEditingSupport.java b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/utils/NattableConfigurationEditingSupport.java
index 0cb9c0405ef..0cb9c0405ef 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/utils/NattableConfigurationEditingSupport.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/utils/NattableConfigurationEditingSupport.java
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/wizards/CreateAndEditTableConfigurationWizard.java b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/wizards/CreateAndEditTableConfigurationWizard.java
index 41f87ff6888..41f87ff6888 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/wizards/CreateAndEditTableConfigurationWizard.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/wizards/CreateAndEditTableConfigurationWizard.java
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/wizards/CreateNattableConfigurationProjectWizard.java b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/wizards/CreateNattableConfigurationProjectWizard.java
index b4380c784d5..b4380c784d5 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/wizards/CreateNattableConfigurationProjectWizard.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/wizards/CreateNattableConfigurationProjectWizard.java
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/wizards/EditTableConfigurationWizard.java b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/wizards/EditTableConfigurationWizard.java
index 3bd3bf34759..3bd3bf34759 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/wizards/EditTableConfigurationWizard.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.customization.nattableconfiguration/src/org/eclipse/papyrus/customization/nattableconfiguration/wizards/EditTableConfigurationWizard.java
diff --git a/plugins/toolsmiths/pom.xml b/plugins/toolsmiths/pom.xml
index 59d4bffe7b7..cabf7941672 100644
--- a/plugins/toolsmiths/pom.xml
+++ b/plugins/toolsmiths/pom.xml
@@ -21,7 +21,16 @@
 		<module>org.eclipse.papyrus.toolsmiths.palette</module>
 		<module>org.eclipse.papyrus.toolsmiths.expressions</module>
 		
+		<module>../infra/gmfdiag/paletteconfiguration/org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.editor</module>
+		<module>../uml/properties/org.eclipse.papyrus.uml.properties.generation</module>
+		<module>../views/properties/org.eclipse.papyrus.views.properties.toolsmiths</module>
+		<module>../infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.edit</module>
+		<module>../infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion.editor</module>
+		<module>../infra/emf/org.eclipse.papyrus.infra.emf.types.ui.properties</module>
+		<module>../uml/org.eclipse.papyrus.uml.types.ui.properties</module>
+		
 		<module>assistants</module>
+		<module>org.eclipse.papyrus.customization.nattableconfiguration</module>
 		<module>org.eclipse.papyrus.codegen</module>
 		<module>org.eclipse.papyrus.def</module>
 		<module>org.eclipse.papyrus.dev.assistants.codegen</module>
diff --git a/plugins/uml/org.eclipse.papyrus.uml.types.ui.properties/pom.xml b/plugins/uml/org.eclipse.papyrus.uml.types.ui.properties/pom.xml
index 6f22af23f0b..9e5cf81304a 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.types.ui.properties/pom.xml
+++ b/plugins/uml/org.eclipse.papyrus.uml.types.ui.properties/pom.xml
@@ -2,10 +2,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
+	
+	<!-- This plugin is not released ouside of the Toolsmith feature and therefore must be part of the toolsmith build -->
 	<parent>
 		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.uml</artifactId>
+    	<artifactId>org.eclipse.papyrus-toolsmiths</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
+		<relativePath>../../toolsmiths/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.types.ui.properties</artifactId>
 	<version>3.1.0-SNAPSHOT</version>
diff --git a/plugins/uml/pom.xml b/plugins/uml/pom.xml
index cb6a35cdc52..45264023a74 100644
--- a/plugins/uml/pom.xml
+++ b/plugins/uml/pom.xml
@@ -17,7 +17,6 @@
 		<module>org.eclipse.papyrus.uml.controlmode.profile</module>
 		<module>org.eclipse.papyrus.uml.documentation.profile</module>
 		<module>org.eclipse.papyrus.uml.types.core</module>
-		<module>org.eclipse.papyrus.uml.types.ui.properties</module>
 		<module>org.eclipse.papyrus.uml.extensionpoints</module>
 		<module>org.eclipse.papyrus.uml.filters</module>
 		<module>org.eclipse.papyrus.uml.filters.edit</module>
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/pom.xml b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/pom.xml
index 62cdc5cde41..0ff691e8cce 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/pom.xml
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties.generation/pom.xml
@@ -2,10 +2,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
+	
+	<!-- This plugin is not released ouside of the Toolsmith feature and therefore must be part of the toolsmith build -->
 	<parent>
-	    <groupId>org.eclipse.papyrus</groupId>
-	    <artifactId>org.eclipse.papyrus.uml-properties</artifactId>
-	    <version>0.0.1-SNAPSHOT</version>
+		<groupId>org.eclipse.papyrus</groupId>
+    	<artifactId>org.eclipse.papyrus-toolsmiths</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+		<relativePath>../../../toolsmiths/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.uml.properties.generation</artifactId>
 	<version>2.1.0-SNAPSHOT</version>
diff --git a/plugins/uml/properties/pom.xml b/plugins/uml/properties/pom.xml
index 71ceb700020..cdb9da19523 100644
--- a/plugins/uml/properties/pom.xml
+++ b/plugins/uml/properties/pom.xml
@@ -16,6 +16,6 @@
 	<modules>
 		<module>org.eclipse.papyrus.uml.properties</module>
 		<module>org.eclipse.papyrus.uml.properties.xtext</module>
-		<module>org.eclipse.papyrus.uml.properties.generation</module>
+		
 	</modules>
 </project>
diff --git a/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/pom.xml b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/pom.xml
index 82338f4d4ec..9ca46f5cde6 100644
--- a/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/pom.xml
+++ b/plugins/views/properties/org.eclipse.papyrus.views.properties.toolsmiths/pom.xml
@@ -3,10 +3,12 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	
+	<!-- This plugin is not released ouside of the Toolsmith feature and therefore must be part of the toolsmith build -->
 	<parent>
-		<artifactId>org.eclipse.papyrus.views-properties</artifactId>
 		<groupId>org.eclipse.papyrus</groupId>
+    	<artifactId>org.eclipse.papyrus-toolsmiths</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
+		<relativePath>../../../toolsmiths/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.papyrus.views.properties.toolsmiths</artifactId>
 	<version>2.0.2-SNAPSHOT</version>
diff --git a/plugins/views/properties/pom.xml b/plugins/views/properties/pom.xml
index 319428527b5..75ef5b7871b 100644
--- a/plugins/views/properties/pom.xml
+++ b/plugins/views/properties/pom.xml
@@ -17,6 +17,6 @@
 	<modules>
 		<module>org.eclipse.papyrus.views.properties</module>
 		<module>org.eclipse.papyrus.views.properties.model.xwt</module>
-		<module>org.eclipse.papyrus.views.properties.toolsmiths</module>
+		
 	</modules>
 </project>
diff --git a/releng/pom.xml b/releng/pom.xml
index 3ca6c1b37d3..92065a15b19 100644
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -33,7 +33,7 @@
 		<eclipse.download>http://download.eclipse.org</eclipse.download> <!-- Deprecated; kept for Legacy. Can be set to file:/home/data/httpd/download.eclipse.org 
 			when building on HIPP -->
 		<papyrus.repo.main>http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/${papyrus.eclipse.target}</papyrus.repo.main>
-		<papyrus.repo.dev>https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Developer/lastSuccessfulBuild/artifact/repository/</papyrus.repo.dev>
+		<papyrus.repo.toolsmiths>https://hudson.eclipse.org/papyrus/job/Papyrus-Master-Toolsmiths/lastSuccessfulBuild/artifact/repository/</papyrus.repo.toolsmiths>
 	</properties>
 
 	<modules>
diff --git a/releng/toolkit/server/build-after-dev.sh b/releng/toolkit/server/build-after-toolsmiths.sh
index eaa760650d1..9272a6a26a4 100644
--- a/releng/toolkit/server/build-after-dev.sh
+++ b/releng/toolkit/server/build-after-toolsmiths.sh
@@ -22,21 +22,34 @@
 ## BUILD_ALIAS=M4
 ##
 
-p2UpdateSiteDir=${WORKSPACE}/releng/dev/site/target/repository
+p2UpdateSiteDir=${WORKSPACE}/releng/toolsmiths/site/target/repository
 updateSite=${WORKSPACE}/repository
 
-updateZipName=Papyrus-Developer-Update.zip
-zipName=Papyrus-Developer.zip
+if [ -n "$BUILD_ALIAS" ]; then
+  buildType=S
+else
+  buildType=N
+fi
+
+COMPACT_BUILD_ID="$BUILD_TIMESTAMP"
+FULL_BUILD_ID=${buildType}${COMPACT_BUILD_ID}
+
+if [ -n "$BUILD_ALIAS" ]; then
+  updateZipName=Papyrus-Update-${BUILD_ALIAS}.zip
+else
+  updateZipName=Papyrus-Update-${FULL_BUILD_ID}.zip
+fi
+zipName=Papyrus-Toolsmiths.zip
 
 rm -rf tmp
-mkdir -p "tmp/dev"
+mkdir -p "tmp/$FULL_BUILD_ID"
 
 rm -rf $updateSite
 mv $p2UpdateSiteDir $updateSite
 
 # create the update site zip
 (cd $updateSite && zip -r $updateZipName *)
-mv $updateSite/$updateZipName "tmp/dev"
+mv $updateSite/$updateZipName "tmp/$FULL_BUILD_ID"
 
 (cd tmp && zip -r $zipName *)
 mv tmp/$zipName .