Merge branch 'v1_4_0_BRANCH'

Conflicts:
	plugins/org.eclipse.emf.eef.modelingbot/src/org/eclipse/emf/eef/modelingBot/swtbot/SWTEEFBot.java
	plugins/org.eclipse.emf.eef.runtime.tests/META-INF/MANIFEST.MF
	releng/org.eclipse.emf.eef.releng.parent/pom.xml
	releng/org.eclipse.emf.eef.update/category.xml
	tests/org.eclipse.emf.eef.nonreg.design/bin/org/eclipse/emf/eef/nonreg/design/Activator.class

11 files changed, 369 insertions, 414 deletions

diff --git a/releng/org.eclipse.emf.eef.releng.parent/pom.xml b/releng/org.eclipse.emf.eef.releng.parent/pom.xml
index d46c24b04..0a8ebc5d6 100644
--- a/releng/org.eclipse.emf.eef.releng.parent/pom.xml
+++ b/releng/org.eclipse.emf.eef.releng.parent/pom.xml
@@ -13,7 +13,7 @@
 	</prerequisites>
 	<groupId>org.eclipse.emf</groupId>
 	<artifactId>org.eclipse.emf.eef.releng.parent</artifactId>
-	<version>1.3.0-SNAPSHOT</version>
+	<version>1.4.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>EEF Parent</name>
@@ -32,10 +32,12 @@
 	</licenses>
 
 	<properties>
-		<tycho-version>0.14.1</tycho-version>
-		<tycho-extras-version>0.14.0</tycho-extras-version>
+		<tycho-version>0.20.0</tycho-version>
+		<tycho-extras-version>0.20.0</tycho-extras-version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	</properties>
+		<maven-resources-version>2.6</maven-resources-version>
+ 		<resource-encoding>UTF-8</resource-encoding>
+ 	</properties>
 
 	<repositories>
 		<repository>
@@ -92,6 +94,111 @@
 	
 	<profiles>
 		<profile>
+			<id>juno4.2</id>
+			<repositories>
+				<repository>
+					<id>releasetrain</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/eclipse/updates/4.2</url>
+				</repository>
+				<repository>
+					<id>swtbot</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site</url>
+				</repository>
+				<repository>
+					<id>emf</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/modeling/emf/emf/updates/2.8</url>
+				</repository>
+				<repository>
+					<id>emf-tools</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/modeling/emf/updates/milestones</url>
+				</repository>
+				<repository>
+					<id>ocl</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/modeling/mdt/ocl/updates/releases/4.0.0</url>
+				</repository>
+				<repository>
+					<id>acceleo</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/modeling/m2t/acceleo/updates/milestones/3.3</url>
+				</repository>
+				<repository>
+					<id>orbit</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/tools/orbit/downloads/drops/R20120526062928/repository/</url>
+				</repository>
+				<repository>
+					<id>epf</id>
+					<layout>p2</layout>
+					<url>http://build.eclipse.org/modeling/emf/eef/epf/</url>
+				</repository>
+				<repository>
+					<id>cdo</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/modeling/emf/cdo/updates/releases/4.0/</url>
+				</repository>
+			</repositories>
+		</profile>
+		<profile>
+			<id>juno3.8</id>
+			<repositories>
+		<repository>
+			<id>cbi</id>
+			<layout>p2</layout>
+			<url>http://download.eclipse.org/cbi/updates/license</url>
+		</repository>
+				<repository>
+					<id>releasetrain</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/eclipse/updates/3.8</url>
+				</repository>
+				<repository>
+					<id>swtbot</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site</url>
+				</repository>
+				<repository>
+					<id>emf</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/modeling/emf/emf/updates/2.8</url>
+				</repository>
+				<repository>
+					<id>emf-tools</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/modeling/emf/updates/milestones</url>
+				</repository>
+				<repository>
+					<id>ocl</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/modeling/mdt/ocl/updates/releases/4.0.0</url>
+				</repository>
+				<repository>
+					<id>acceleo</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/modeling/m2t/acceleo/updates/releases/3.3</url>
+				</repository>
+				<repository>
+					<id>orbit</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/tools/orbit/downloads/drops/R20120526062928/repository</url>
+				</repository>
+				<repository>
+					<id>epf</id>
+					<layout>p2</layout>
+					<url>http://build.eclipse.org/modeling/emf/eef/epf/</url>
+				</repository>
+				<repository>
+					<id>cdo</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/modeling/emf/cdo/updates/releases/4.0/</url>
+				</repository>
+			</repositories>
+		</profile>
+		<profile>
 			<id>sign</id>
 			<activation>
 				<property>
@@ -162,6 +269,65 @@
 		</profile>
 	</profiles>
 
+	<modules>
+		<module>../../plugins/org.eclipse.emf.eef.runtime</module>
+		<module>../../plugins/org.eclipse.emf.eef.runtime.extended</module>
+		<module>../../plugins/org.eclipse.emf.eef.runtime.tests</module>
+		<module>../../plugins/org.eclipse.emf.eef.cdo.runtime</module>
+
+		<module>../../doc/org.eclipse.emf.eef.doc</module>
+
+		<module>../../plugins/org.eclipse.emf.eef.components</module>
+		<module>../../plugins/org.eclipse.emf.eef.components.edit</module>
+		<module>../../plugins/org.eclipse.emf.eef.components.editor</module>
+		<module>../../plugins/org.eclipse.emf.eef.eefgen</module>
+		<module>../../plugins/org.eclipse.emf.eef.eefgen.edit</module>
+		<module>../../plugins/org.eclipse.emf.eef.eefgen.editor</module>
+		<module>../../plugins/org.eclipse.emf.eef.mapping</module>
+		<module>../../plugins/org.eclipse.emf.eef.mapping.edit</module>
+		<module>../../plugins/org.eclipse.emf.eef.views</module>
+		<module>../../plugins/org.eclipse.emf.eef.views.edit</module>
+		<module>../../plugins/org.eclipse.emf.eef.views.editor</module>
+		<module>../../plugins/org.eclipse.emf.eef.editor.model</module>
+		<module>../../plugins/org.eclipse.emf.eef.extended.widgets.richtext</module>
+
+		<module>../../plugins/org.eclipse.emf.eef.modelingbot</module>
+		<module>../../plugins/org.eclipse.emf.eef.modelingbot.edit</module>
+		<module>../../plugins/org.eclipse.emf.eef.modelingbot.editor</module>
+
+		<module>../../plugins/org.eclipse.emf.eef.codegen</module>
+		<module>../../plugins/org.eclipse.emf.eef.codegen.launcher</module>
+		<module>../../plugins/org.eclipse.emf.eef.codegen.ecore</module>
+		<module>../../plugins/org.eclipse.emf.eef.codegen.extended</module>
+		<module>../../plugins/org.eclipse.emf.eef.codegen.extended.widgets.richtext</module>
+		<!-- <module>../../plugins/org.eclipse.emf.eef.tests.codegen</module> -->
+
+		<module>../../plugins/org.eclipse.emf.eef.branding</module>
+		<module>../../features/org.eclipse.emf.eef.runtime-feature</module>
+		<module>../../features/org.eclipse.emf.eef.collab.runtime-feature</module>
+		<module>../../features/org.eclipse.emf.eef.extended-feature</module>
+		<module>../../features/org.eclipse.emf.eef.edt-feature</module>
+		<module>../../features/org.eclipse.emf.eef.codegen.ecore-feature</module>
+		<module>../../features/org.eclipse.emf.eef.codegen.richtext-feature</module>
+		<module>../../features/org.eclipse.emf.eef.richtext-feature</module>
+		<module>../../features/org.eclipse.emf.eef.codegen.uml.feature</module>
+		<module>../../features/org.eclipse.emf.eef.sdk-feature</module>
+		<!-- deprecated <module>../../features/org.eclipse.emf.eef.indigo-feature</module> -->
+
+		<module>../org.eclipse.emf.eef.update</module>
+		<module>../org.eclipse.emf.eef.uml.update</module>
+
+		<module>../../tests/org.eclipse.emf.examples.eef</module>
+		<module>../../tests/org.eclipse.emf.examples.eef.edit</module>
+		<module>../../tests/org.eclipse.emf.examples.eef.editor</module>
+		<module>../../tests/org.eclipse.emf.examples.eef.tests.junit</module>
+		<module>../../tests/org.eclipse.emf.eef.tests.nonreg</module>
+		<module>../../tests/org.eclipse.emf.eef.tests.nonreg.edit</module>
+		<module>../../tests/org.eclipse.emf.eef.tests.nonreg.editor</module>
+		<module>../../tests/org.eclipse.emf.eef.tests.nonreg.junit</module>
+
+	</modules>
+
 	<build>
 		<plugins>
 			<plugin>
@@ -243,6 +409,14 @@
 					<artifactId>maven-antrun-plugin</artifactId>
 					<version>1.3</version>
 				</plugin>
+				<plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>${maven-resources-version}</version>
+          <configuration>
+            <encoding>${resource-encoding}</encoding>
+          </configuration>
+        </plugin>
 			</plugins>
 		</pluginManagement>
 	</build>
diff --git a/releng/org.eclipse.emf.eef.uml.update/.gitignore b/releng/org.eclipse.emf.eef.uml.update/.gitignore
new file mode 100644
index 000000000..02ce7557c
--- /dev/null
+++ b/releng/org.eclipse.emf.eef.uml.update/.gitignore
@@ -0,0 +1,3 @@
+target
+artifacts*.xml
+promote.properties
diff --git a/releng/org.eclipse.emf.eef.uml.update/.project b/releng/org.eclipse.emf.eef.uml.update/.project
new file mode 100644
index 000000000..20026a1b6
--- /dev/null
+++ b/releng/org.eclipse.emf.eef.uml.update/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.emf.eef.uml.update</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/releng/org.eclipse.emf.eef.uml.update/category.xml b/releng/org.eclipse.emf.eef.uml.update/category.xml
new file mode 100644
index 000000000..d76eeb5d4
--- /dev/null
+++ b/releng/org.eclipse.emf.eef.uml.update/category.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+   <description>
+      To install these features, point Eclipse at this site.
+   </description>
+   <feature url="features/org.eclipse.emf.eef.codegen.uml.feature_1.4.0.qualifier.jar" id="org.eclipse.emf.eef.codegen.uml.feature" version="1.4.0.qualifier">
+      <category name="eef.integration"/>
+   </feature>
+   <category-def name="eef.integration" label="EEF Integration">
+      <description>
+         EEF integration for specific cases, like UML2.
+      </description>
+   </category-def>
+</site>
diff --git a/releng/org.eclipse.emf.eef.uml.update/pom.xml b/releng/org.eclipse.emf.eef.uml.update/pom.xml
new file mode 100644
index 000000000..2fcc6f05d
--- /dev/null
+++ b/releng/org.eclipse.emf.eef.uml.update/pom.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2011 Obeo.
+    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:
+        Obeo - initial creator
+ -->
+
+<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/maven-v4_0_0.xsd"
+>
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.eclipse.emf</groupId>
+		<artifactId>org.eclipse.emf.eef.releng.parent</artifactId>
+		<relativePath>../../releng/org.eclipse.emf.eef.releng.parent</relativePath>
+		<version>1.4.0-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>org.eclipse.emf.eef.uml.update</artifactId>
+	<packaging>eclipse-repository</packaging>
+
+	<name>EEF UML Repository</name>
+	<!-- see http://issues.sonatype.org/browse/TYCHO-313 -->
+	<version>1.4.0-SNAPSHOT</version>
+
+	<build>
+   <resources>
+      <resource>
+        <directory>.</directory>
+        <filtering>true</filtering>
+        <includes>
+          <include>publisher.properties</include>
+        </includes>
+      </resource>
+    </resources>
+    		<plugins>
+
+           <plugin>
+                <groupId>org.eclipse.tycho</groupId>
+                <artifactId>tycho-p2-repository-plugin</artifactId>
+                <version>${tycho-version}</version>
+                <configuration>
+                    <createArtifactRepository>true</createArtifactRepository>
+                    <finalName>${project.artifactId}-${unqualifiedVersion}.${buildQualifier}</finalName>
+                    <compress>true</compress>
+                </configuration>
+            </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>verify</phase>
+            <goals>
+              <goal>resources</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <outputDirectory>${project.build.directory}</outputDirectory>
+        </configuration>
+      </plugin>
+      		</plugins>
+	</build>
+
+</project>
diff --git a/releng/org.eclipse.emf.eef.uml.update/publisher.properties b/releng/org.eclipse.emf.eef.uml.update/publisher.properties
new file mode 100644
index 000000000..61c319c18
--- /dev/null
+++ b/releng/org.eclipse.emf.eef.uml.update/publisher.properties
@@ -0,0 +1,8 @@
+# EEF publisher properties
+UPDATE_SITE__UNQUALIFIED_VERSION=${unqualifiedVersion}
+UPDATE_SITE__QUALIFIED_VERSION=${unqualifiedVersion}.${buildQualifier}
+UPDATE_SITE__ARTIFACT_NAME=${project.artifactId}-${unqualifiedVersion}.${buildQualifier}.zip
+UPDATE_SITE__ARTIFACT_URL=${env.JOB_URL}${env.BUILD_NUMBER}/artifact/releng/${project.artifactId}/target/${project.artifactId}-${unqualifiedVersion}.${buildQualifier}.zip
+
+
+ 
\ No newline at end of file
diff --git a/releng/org.eclipse.emf.eef.update/category.xml b/releng/org.eclipse.emf.eef.update/category.xml
index 5abbd5a78..c10234012 100644
--- a/releng/org.eclipse.emf.eef.update/category.xml
+++ b/releng/org.eclipse.emf.eef.update/category.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<!--
-    Copyright (c) 2008, 2010 Obeo.
-    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:
-        Obeo - initial API and implementation
- -->
+<!--

+    Copyright (c) 2008, 2010 Obeo.

+    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:

+        Obeo - initial API and implementation

+ -->

 <site>

    <description>

       To install these features, point Eclipse at this site.

@@ -33,29 +33,29 @@
    </feature>

    <category-def name="eef.sdk" label="EEF SDK">

       <description>

-         EEF SDK package. It contains runtime, metamodels, generators,
-   documentation and extended capabilities (with source).
-      </description>
-   </category-def>
-   <category-def name="eef.features" label="EEF Common">
-      <description>
-         Contains all necessary features for EEF : EEF runtime, EEF metamodels, EEF
-   generators and EEF documentation.
-      </description>
-   </category-def>
-   <category-def name="eef.integration" label="EEF Integration">
-      <description>
-         EEF integration for specific cases, like UML2.
-      </description>
-   </category-def>
-   <category-def name="eef.tests" label="EEF Tests Utilities">
-      <description>
-         Several utilities for testing EEF forms.
-      </description>
-   </category-def>
-   <category-def name="eef.extension" label="EEF Extension">
-      <description>
-         EEF Extensions.
-      </description>
-   </category-def>
-</site>
+         EEF SDK package. It contains runtime, metamodels, generators,

+   documentation and extended capabilities (with source).

+      </description>

+   </category-def>

+   <category-def name="eef.features" label="EEF Common">

+      <description>

+         Contains all necessary features for EEF : EEF runtime, EEF metamodels, EEF

+   generators and EEF documentation.

+      </description>

+   </category-def>

+   <category-def name="eef.integration" label="EEF Integration">

+      <description>

+         EEF integration for specific cases, like UML2.

+      </description>

+   </category-def>

+   <category-def name="eef.tests" label="EEF Tests Utilities">

+      <description>

+         Several utilities for testing EEF forms.

+      </description>

+   </category-def>

+   <category-def name="eef.extension" label="EEF Extension">

+      <description>

+         EEF Extensions.

+      </description>

+   </category-def>

+</site>

diff --git a/releng/org.eclipse.emf.eef.update/p2.xsl b/releng/org.eclipse.emf.eef.update/p2.xsl
deleted file mode 100644
index 8c804d3b7..000000000
--- a/releng/org.eclipse.emf.eef.update/p2.xsl
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-	<xsl:output method="xml" indent="yes"/>
-
-	<xsl:param name="mirrorsURL"/>
-
-	<!-- add p2.mirrorsURL and p2.statsURI properties -->
-	<xsl:template match="repository/properties">
-		<properties size='{@size+2}'>
-			<xsl:copy-of select="property"/>
-			<property name='p2.statsURI' value='http://download.eclipse.org/stats'/>
-			<xsl:element name="property">
-				<xsl:attribute name="name">p2.mirrorsURL</xsl:attribute>
-				<xsl:attribute name="value"><xsl:value-of select="$mirrorsURL"/></xsl:attribute>
-			</xsl:element>
-		</properties>
-	</xsl:template>
-
-	<!-- add p2.mirrorsURL property -->
-	<xsl:template match="repository/artifacts/artifact/properties[../@classifier='org.eclipse.update.feature']">
-		<properties size='{@size+1}'>
-			<xsl:copy-of select="property"/>
-			<property name='download.stats' value='{../@id}-{../@version}'/>
-		</properties>
-	</xsl:template>
-
-	<!-- copy everything else -->
-	<xsl:template match="* | @*">
-		<xsl:copy>
-			<xsl:copy-of select="@*"/>
-			<xsl:apply-templates/>
-		</xsl:copy>
-	</xsl:template>
-
-</xsl:stylesheet>
diff --git a/releng/org.eclipse.emf.eef.update/pom.xml b/releng/org.eclipse.emf.eef.update/pom.xml
index 1b3424b20..720226463 100644
--- a/releng/org.eclipse.emf.eef.update/pom.xml
+++ b/releng/org.eclipse.emf.eef.update/pom.xml
@@ -19,7 +19,7 @@
 		<groupId>org.eclipse.emf</groupId>
 		<artifactId>org.eclipse.emf.eef.releng.parent</artifactId>
 		<relativePath>../../releng/org.eclipse.emf.eef.releng.parent</relativePath>
-		<version>1.3.0-SNAPSHOT</version>
+		<version>1.4.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.emf.eef.update</artifactId>
@@ -27,58 +27,46 @@
 
 	<name>EEF Repository</name>
 	<!-- see http://issues.sonatype.org/browse/TYCHO-313 -->
-	<version>1.3.0-SNAPSHOT</version>
+	<version>1.4.0-SNAPSHOT</version>
 
 	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-resources-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>copy-resources</id>
-						<phase>validate</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${basedir}/target/repository</outputDirectory>
-							<resources>
-								<resource>
-									<directory>.</directory>
-									<includes>
-										<include>index.html</include>
-										<include>web/*</include>
-									</includes>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>prepare_promotion</id>
-						<phase>verify</phase>
-						<goals>
-							<goal>run</goal>
-						</goals>
-						<configuration>
-							<tasks>
-								<!-- create a properties file for promotion process -->
-								<mkdir dir="${project.build.directory}/promotion"/>
-								<echo file="${project.build.directory}/promotion/promote.properties"
-									message="#EEF promotion process.${line.separator}build.alias=${BUILD_ALIAS}${line.separator}build.qualifier=${env.BUILD_TYPE}${buildQualifier}${line.separator}version=${unqualifiedVersion}"/>
-								<!-- copy necessary scripts to archive location -->
-								<copy file="p2.xsl" todir="${project.build.directory}/promotion"/>
-								<copy file="promoter.xml" todir="${project.build.directory}/promotion"/>
-							</tasks>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
+   <resources>
+      <resource>
+        <directory>.</directory>
+        <filtering>true</filtering>
+        <includes>
+          <include>publisher.properties</include>
+        </includes>
+      </resource>
+    </resources>
+    		<plugins>
+
+           <plugin>
+                <groupId>org.eclipse.tycho</groupId>
+                <artifactId>tycho-p2-repository-plugin</artifactId>
+                <version>${tycho-version}</version>
+                <configuration>
+                    <createArtifactRepository>true</createArtifactRepository>
+                    <finalName>${project.artifactId}-${unqualifiedVersion}.${buildQualifier}</finalName>
+                    <compress>true</compress>
+                </configuration>
+            </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>verify</phase>
+            <goals>
+              <goal>resources</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <outputDirectory>${project.build.directory}</outputDirectory>
+        </configuration>
+      </plugin>
+      		</plugins>
 	</build>
 
 </project>
diff --git a/releng/org.eclipse.emf.eef.update/promoter.xml b/releng/org.eclipse.emf.eef.update/promoter.xml
deleted file mode 100644
index 2f74b489e..000000000
--- a/releng/org.eclipse.emf.eef.update/promoter.xml
+++ /dev/null
@@ -1,288 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2011 Obeo.
-  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:
-      Obeo - initial API and implementation
-
- $Id: promoter.xml,v 1.36 2012/03/21 08:40:06 sbouchet Exp $
--->
-<project name="Promoter" default="main">
-	<!--
-	This promotion script helps to automatically promote the last sucessful build of tycho based build to correct location.
-	
-	Be sure to use at least ant 1.8.2 to launch this script.
-	
-	Ant 1.8.2 is located here : /shared/common/apache-ant-1.8.2/
-	on build.eclipse.org, do a 
-	$> export ANT_HOME=/shared/common/apache-ant-1.8.2/ 
-	-->
-
-	<property name="downloads.project.root" value="modeling/emft/eef" />
-	<property name="build.root" value="/shared/jobs/emf-eef-1.2/lastSuccessful/archive/releng/org.eclipse.emf.eef.update/target/" />
-	<property name="thirdPartyJarsDir" value="/shared/modeling/emf/eef/3rdPartyJars" />
-	<property name="project.name" value="EEF" />
-	<property name="final.updatesite.name" value="emf-eef-Update" />
-	<property name="build.root.updatesite.name" value="org.eclipse.emf.eef.update.zip" />
-	<property name="group.owner" value="modeling.emf.eef" />
-
-	<!--# To permit automatic downloads of non-EPL compatible code, override this to property to "Y" -->
-	<property name="thirdPartyDownloadLicenseAcceptance" value="Y" />
-
-	<property name="downloads.root" value="/home/data/httpd/download.eclipse.org/" />
-	<property name="downloads.area" value="${downloads.root}/${downloads.project.root}" />
-	<property name="property.file.location" location="${build.root}/promotion/promote.properties" />
-	<antversion property="antversion" />
-
-	<!--
-	most of the code comes from Athena CBI.
-	see http://wiki.eclipse.org/Common_Build_Infrastructure
-	-->
-	<target name="check.ant-contrib" if="antContribJarUnavailable">
-		<condition property="thirdPartyDownloadLicenseAcceptanceOK">
-			<and>
-				<isset property="thirdPartyDownloadLicenseAcceptance" />
-				<or>
-					<equals arg1="${thirdPartyDownloadLicenseAcceptance}" arg2="Y" />
-					<equals arg1="${thirdPartyDownloadLicenseAcceptance}" arg2="I accept" />
-					<equals arg1="${thirdPartyDownloadLicenseAcceptance}" arg2="&quot;I accept&quot;" />
-				</or>
-			</and>
-		</condition>
-		<antcall target="get.ant-contrib" />
-		<available file="${thirdPartyJarsDir}/ant-contrib.jar" property="antContribJarAvailable" />
-		<fail unless="antContribJarAvailable">Error! 
-
-Ant-Contrib is required. Download it from http://sourceforge.net/projects/ant-contrib/files/ant-contrib/1.0b3/ant-contrib-1.0b3-bin.zip/download,
-then place it in the following location. You can also redefine the path in the promote.properties file:
-
-$${thirdPartyJarsDir}/ant-contrib.jar          = ${thirdPartyJarsDir}/ant-contrib.jar
-
-Or, to download this automatically, see promoter.xml#thirdPartyDownloadLicenseAcceptance property.
-		</fail>
-	</target>
-
-	<target name="get.ant-contrib" if="thirdPartyDownloadLicenseAcceptanceOK">
-		<get src="http://sourceforge.net/projects/ant-contrib/files/ant-contrib/1.0b3/ant-contrib-1.0b3-bin.zip/download" dest="${java.io.tmpdir}/ant-contrib-1.0b3-bin.zip" usetimestamp="true" />
-		<mkdir dir="${java.io.tmpdir}/ant-contrib-1.0b3-bin.zip_" />
-		<unzip src="${java.io.tmpdir}/ant-contrib-1.0b3-bin.zip" dest="${java.io.tmpdir}/ant-contrib-1.0b3-bin.zip_" overwrite="true" />
-		<mkdir dir="${thirdPartyJarsDir}" />
-		<copy file="${java.io.tmpdir}/ant-contrib-1.0b3-bin.zip_/ant-contrib/ant-contrib-1.0b3.jar" tofile="${thirdPartyJarsDir}/ant-contrib.jar" failonerror="true" />
-		<delete dir="${java.io.tmpdir}/ant-contrib-1.0b3-bin.zip_" includeemptydirs="true" quiet="true" />
-		<delete file="${java.io.tmpdir}/ant-contrib-1.0b3-bin.zip" quiet="true" />
-	</target>
-
-	<target name="init">
-		<fail message="Please use at least ant 1.8.0. Modify your ANT_HOME path to point to a correct location">
-			<condition>
-				<not>
-					<contains string="${antversion}" substring="1.8" />
-				</not>
-			</condition>
-		</fail>
-		<condition property="antContribJarUnavailable">
-			<not>
-				<available file="${thirdPartyJarsDir}/ant-contrib.jar" type="file" />
-			</not>
-		</condition>
-		<antcall target="check.ant-contrib" />
-		<!-- This will fail if ant-contrib.jar cannot be found. You can install Ant-Contrib via RPM, or download it here:
-				http://sourceforge.net/projects/ant-contrib/files/ant-contrib/1.0b3/ant-contrib-1.0b3-bin.zip/download
-		-->
-		<taskdef resource="net/sf/antcontrib/antlib.xml">
-			<classpath>
-				<pathelement location="${thirdPartyJarsDir}/ant-contrib.jar" />
-			</classpath>
-		</taskdef>
-		<available file="${property.file.location}" property="propertyFileAvailable" />
-		<fail message="property.file.location property must be defined" unless="propertyFileAvailable" />
-	</target>
-
-	<target name="load.properties">
-		<property file="${property.file.location}" />
-	</target>
-
-	<target name="init.properties">
-		<fail message="build.qualifier property must be defined">
-			<condition>
-				<not>
-					<and>
-						<isset property="build.qualifier" />
-						<length string="${build.qualifier}" trim="true" when="greater" length="0" />
-					</and>
-				</not>
-			</condition>
-		</fail>
-		<propertyregex override="true" property="build.qualifier" input="${build.qualifier}" regexp="v" replace="" casesensitive="false" />
-		<fail message="version property must be defined">
-			<condition>
-				<not>
-					<and>
-						<isset property="version" />
-						<length string="${version}" trim="true" when="greater" length="0" />
-					</and>
-				</not>
-			</condition>
-		</fail>
-		<if>
-			<and>
-				<isset property="build.alias" />
-				<length string="${build.alias}" trim="true" when="greater" length="0" />
-			</and>
-			<then>
-				<property name="final.version.qualifier" value="${build.alias}" />
-			</then>
-			<else>
-				<property name="final.version.qualifier" value="${build.qualifier}" />
-			</else>
-		</if>
-		<fail message="build.root property must be defined" unless="build.root" />
-		<fail message="downloads.area property must be defined" unless="downloads.area" />
-	</target>
-
-	<target name="main" depends="init,load.properties,init.properties">
-
-		<!-- publish into drops ( Zips ) -->
-		<antcall target="-publish.build.drops" inheritall="true" />
-
-		<!-- publish p2 repository -->
-		<antcall target="-publish.build.repository" inheritall="true" />
-	</target>
-
-	<target name="-publish.build.drops">
-		<property name="build.drop.directory" location="${downloads.area}/downloads/drops/${version}/${build.qualifier}" />
-
-		<echo message="Currently working on the version ${version}"/>
-		<delete dir="${build.drop.directory}" />
-		<mkdir dir="${build.drop.directory}" />
-
-		<!-- copy zip packages -->
-		<copy todir="${build.drop.directory}">
-			<fileset dir="${build.root}">
-				<filename name="*.zip" />
-			</fileset>
-		</copy>
-
-		<!-- rename UpdateSite zip package -->
-		<move tofile="${build.drop.directory}/${final.updatesite.name}-${final.version.qualifier}.zip" file="${build.drop.directory}/${build.root.updatesite.name}" />
-
-		<!-- genereate md5 checksums -->
-		<checksum algorithm="MD5" fileext=".md5" format="MD5SUM">
-			<fileset dir="${build.drop.directory}" />
-		</checksum>
-
-		<fileset id="drop.resources" dir="${build.drop.directory}">
-			<or>
-				<type type="dir" />
-				<type type="file" />
-			</or>
-		</fileset>
-
-		<!-- chgrp -->
-		<chgrp group="${group.owner}" type="both" verbose="true">
-			<fileset refid="drop.resources" />
-		</chgrp>
-
-	</target>
-
-	<target name="-publish.build.repository">
-		<!-- determine the base version -->
-		<propertyregex property="base.version" input="${version}" regexp="^(\d+\.\d+)\.\d+.*$" select="\1" casesensitive="false" />
-
-		<!-- setup composite.repository.base and composite.type according to the build type -->
-		<condition property="composite.repository.base" value="interim/${base.version}">
-			<matches pattern="^I" string="${build.qualifier}" />
-		</condition>
-		<condition property="composite.repository.base" value="milestones/${base.version}">
-			<matches pattern="^[MS]" string="${build.qualifier}" />
-		</condition>
-		<condition property="composite.repository.base" value="releases/${base.version}">
-			<matches pattern="^R" string="${build.qualifier}" />
-		</condition>
-		<condition property="composite.repository.base" value="nightly/${base.version}">
-			<matches pattern="^N" string="${build.qualifier}" />
-		</condition>
-		<condition property="composite.type" value="Interim">
-			<matches pattern="^I" string="${build.qualifier}" />
-		</condition>
-		<condition property="composite.type" value="Milestones">
-			<matches pattern="^[MS]" string="${build.qualifier}" />
-		</condition>
-		<condition property="composite.type" value="Releases">
-			<matches pattern="^R" string="${build.qualifier}" />
-		</condition>
-		<condition property="composite.type" value="Nightly">
-			<matches pattern="^N" string="${build.qualifier}" />
-		</condition>
-
-		<property name="composite.repository.directory" location="${downloads.area}/updates/${composite.repository.base}" />
-		<property name="composite.repository.url" value="file:/${composite.repository.directory}" />
-		<property name="build.repository.directory" location="${composite.repository.directory}/${build.qualifier}" />
-		<property name="mirror.repository.path" value="${downloads.project.root}/updates/${composite.repository.base}/${build.qualifier}" />
-
-		<delete dir="${build.repository.directory}" />
-		<mkdir dir="${build.repository.directory}" />
-
-		<!-- unzip update site to final location -->
-		<unzip dest="${build.repository.directory}">
-			<fileset dir="${build.root}">
-				<filename name="*.zip" />
-			</fileset>
-		</unzip>
-
-		<!-- adding p2.index -->
-		<echo file="${build.repository.directory}/p2.index" message="version = 1${line.separator}metadata.repository.factory.order = content.xml,\!${line.separator}artifact.repository.factory.order = artifacts.xml,\!" />
-
-		<!-- adding p2.mirrorsURL and p2.statsURI to the repository -->
-		<unzip dest="${build.repository.directory}">
-			<fileset file="${build.repository.directory}/artifacts.jar" />
-		</unzip>
-
-		<move file="${build.repository.directory}/artifacts.xml" tofile="${build.repository.directory}/artifacts.original.xml" />
-
-		<xslt style="p2.xsl" in="${build.repository.directory}/artifacts.original.xml" out="${build.repository.directory}/artifacts.xml">
-			<param name="mirrorsURL" expression="http://www.eclipse.org/downloads/download.php?file=${mirror.repository.path}&amp;format=xml" />
-		</xslt>
-
-		<zip destfile="${build.repository.directory}/artifacts.jar" basedir="${build.repository.directory}" includes="artifacts.xml" />
-
-		<delete file="${build.repository.directory}/artifacts.xml" />
-		<delete file="${build.repository.directory}/artifacts.original.xml" />
-
-		<!-- add to composite repo -->
-		<ant antfile="/shared/modeling/tools/promotion/manage-composite.xml" target="add" dir="${composite.repository.directory}">
-			<property name="user.dir" value="${composite.repository.directory}" />
-			<property name="child.repository" value="${build.qualifier}" />
-			<property name="composite.name" value="${project.name} ${base.version} ${composite.type} Update Site" />
-		</ant>
-
-		<!-- add p2.index on top of composite repo is needed -->
-		<if>
-			<not>
-				<available file="${composite.repository.directory}/p2.index" type="file" />
-			</not>
-			<then>
-				<echo file="${composite.repository.directory}/p2.index" message="version = 1${line.separator}metadata.repository.factory.order = compositeContent.xml,\!${line.separator}artifact.repository.factory.order = compositeArtifacts.xml,\!" />
-			</then>
-		</if>
-
-		<fileset id="repository.resources" dir="${composite.repository.directory}">
-			<or>
-				<filename name="compositeContent.*" />
-				<filename name="compositeArtifacts.*" />
-				<filename name="p2.index" />
-				<filename name="${build.qualifier}/**" />
-			</or>
-		</fileset>
-
-		<!-- chgrp -->
-		<chgrp group="${group.owner}" type="both" verbose="true">
-			<fileset refid="repository.resources" />
-		</chgrp>
-	</target>
-
-</project>
diff --git a/releng/org.eclipse.emf.eef.update/publisher.properties b/releng/org.eclipse.emf.eef.update/publisher.properties
new file mode 100644
index 000000000..61c319c18
--- /dev/null
+++ b/releng/org.eclipse.emf.eef.update/publisher.properties
@@ -0,0 +1,8 @@
+# EEF publisher properties
+UPDATE_SITE__UNQUALIFIED_VERSION=${unqualifiedVersion}
+UPDATE_SITE__QUALIFIED_VERSION=${unqualifiedVersion}.${buildQualifier}
+UPDATE_SITE__ARTIFACT_NAME=${project.artifactId}-${unqualifiedVersion}.${buildQualifier}.zip
+UPDATE_SITE__ARTIFACT_URL=${env.JOB_URL}${env.BUILD_NUMBER}/artifact/releng/${project.artifactId}/target/${project.artifactId}-${unqualifiedVersion}.${buildQualifier}.zip
+
+
+ 
\ No newline at end of file