Bug 509282
Refactor/rename targetplatform Papyrus --> EClipse Formal Modeling
Change-Id: I8372e67953be18022f0c5bef6fa88634134434d1
Signed-off-by: Arnault Lapitre <arnault.lapitre@cea.fr>
diff --git a/targetplatform/org.eclipse.efm.modeling.targetplatform.neon-papyrusnightly/.project b/targetplatform/org.eclipse.efm.modeling.targetplatform.neon-papyrus/.project
similarity index 82%
rename from targetplatform/org.eclipse.efm.modeling.targetplatform.neon-papyrusnightly/.project
rename to targetplatform/org.eclipse.efm.modeling.targetplatform.neon-papyrus/.project
index d9d84f3..c4106e0 100644
--- a/targetplatform/org.eclipse.efm.modeling.targetplatform.neon-papyrusnightly/.project
+++ b/targetplatform/org.eclipse.efm.modeling.targetplatform.neon-papyrus/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.efm.modeling.targetplatform.neon-papyrusnightly</name>
+ <name>org.eclipse.efm.modeling.targetplatform.neon-papyrus</name>
<comment></comment>
<projects>
</projects>
diff --git a/targetplatform/org.eclipse.efm.modeling.targetplatform.neon-papyrusnightly/.settings/org.eclipse.core.resources.prefs b/targetplatform/org.eclipse.efm.modeling.targetplatform.neon-papyrus/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from targetplatform/org.eclipse.efm.modeling.targetplatform.neon-papyrusnightly/.settings/org.eclipse.core.resources.prefs
rename to targetplatform/org.eclipse.efm.modeling.targetplatform.neon-papyrus/.settings/org.eclipse.core.resources.prefs
diff --git a/targetplatform/org.eclipse.efm.modeling.targetplatform.neon-papyrusnightly/.settings/org.eclipse.m2e.core.prefs b/targetplatform/org.eclipse.efm.modeling.targetplatform.neon-papyrus/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from targetplatform/org.eclipse.efm.modeling.targetplatform.neon-papyrusnightly/.settings/org.eclipse.m2e.core.prefs
rename to targetplatform/org.eclipse.efm.modeling.targetplatform.neon-papyrus/.settings/org.eclipse.m2e.core.prefs
diff --git a/targetplatform/org.eclipse.efm.modeling.targetplatform.neon-papyrus/org.eclipse.efm.modeling.targetplatform.neon-papyrus.target b/targetplatform/org.eclipse.efm.modeling.targetplatform.neon-papyrus/org.eclipse.efm.modeling.targetplatform.neon-papyrus.target
new file mode 100644
index 0000000..7a105c5
--- /dev/null
+++ b/targetplatform/org.eclipse.efm.modeling.targetplatform.neon-papyrus/org.eclipse.efm.modeling.targetplatform.neon-papyrus.target
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?><target name="Eclipse Formal Modeling with Papyrus Neon Nightly" sequenceNumber="1458824766">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/releases/neon/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.xtext.sdk.feature.group" version="2.10.0.v201605250459"/>
+<unit id="org.eclipse.xtend.sdk.feature.group" version="2.10.0.v201605250459"/>
+<unit id="org.eclipse.xtext.redist.feature.group" version="2.10.0.v201605250459"/>
+<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.10.0/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.papyrus.designer.languages.common.feature.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="2.0.3.201703080851"/>
+<repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/neon"/>
+</location>
+</locations>
+</target>
diff --git a/targetplatform/org.eclipse.efm.modeling.targetplatform.neon-papyrusnightly/org.eclipse.efm.modeling.targetplatform.neon-papyrusnightly.tpd b/targetplatform/org.eclipse.efm.modeling.targetplatform.neon-papyrus/org.eclipse.efm.modeling.targetplatform.neon-papyrus.tpd
similarity index 85%
rename from targetplatform/org.eclipse.efm.modeling.targetplatform.neon-papyrusnightly/org.eclipse.efm.modeling.targetplatform.neon-papyrusnightly.tpd
rename to targetplatform/org.eclipse.efm.modeling.targetplatform.neon-papyrus/org.eclipse.efm.modeling.targetplatform.neon-papyrus.tpd
index 392f141..c9780ee 100644
--- a/targetplatform/org.eclipse.efm.modeling.targetplatform.neon-papyrusnightly/org.eclipse.efm.modeling.targetplatform.neon-papyrusnightly.tpd
+++ b/targetplatform/org.eclipse.efm.modeling.targetplatform.neon-papyrus/org.eclipse.efm.modeling.targetplatform.neon-papyrus.tpd
@@ -1,4 +1,4 @@
-target "Papyrus Neon Nightly" with source requirements
+target "Eclipse Formal Modeling with Papyrus Neon" with source requirements
location "http://download.eclipse.org/releases/neon/" eclipse-neon {
org.eclipse.platform.feature.group lazy
diff --git a/targetplatform/org.eclipse.efm.modeling.targetplatform.neon-papyrusnightly/pom.xml b/targetplatform/org.eclipse.efm.modeling.targetplatform.neon-papyrus/pom.xml
similarity index 70%
rename from targetplatform/org.eclipse.efm.modeling.targetplatform.neon-papyrusnightly/pom.xml
rename to targetplatform/org.eclipse.efm.modeling.targetplatform.neon-papyrus/pom.xml
index fb38dd1..a44da87 100644
--- a/targetplatform/org.eclipse.efm.modeling.targetplatform.neon-papyrusnightly/pom.xml
+++ b/targetplatform/org.eclipse.efm.modeling.targetplatform.neon-papyrus/pom.xml
@@ -7,8 +7,8 @@
<artifactId>org.eclipse.efm.modeling.targetplatform</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
- <artifactId>org.eclipse.efm.modeling.targetplatform.neon-papyrusnightly</artifactId>
+ <artifactId>org.eclipse.efm.modeling.targetplatform.neon-papyrus</artifactId>
<packaging>eclipse-target-definition</packaging>
- <name>org.eclipse.efm.modeling.targetplatform.neon-papyrusnightly</name>
- <description>This plug-in contains the target definition for Papyrus org.eclipse.efm-modeling in Neon with Papyrus nightly.</description>
+ <name>org.eclipse.efm.modeling.targetplatform.neon-papyrus</name>
+ <description>This plug-in contains the target definition for Eclipse Formal Modeling in Neon with Papyrus.</description>
</project>
\ No newline at end of file
diff --git a/targetplatform/org.eclipse.efm.modeling.targetplatform.neon-papyrusnightly/target.file b/targetplatform/org.eclipse.efm.modeling.targetplatform.neon-papyrus/target.file
similarity index 100%
rename from targetplatform/org.eclipse.efm.modeling.targetplatform.neon-papyrusnightly/target.file
rename to targetplatform/org.eclipse.efm.modeling.targetplatform.neon-papyrus/target.file
diff --git a/targetplatform/org.eclipse.efm.modeling.targetplatform.neon-papyrusnightly/org.eclipse.efm.modeling.targetplatform.neon-papyrusnightly.target b/targetplatform/org.eclipse.efm.modeling.targetplatform.neon-papyrusnightly/org.eclipse.efm.modeling.targetplatform.neon-papyrusnightly.target
deleted file mode 100644
index 3e18595..0000000
--- a/targetplatform/org.eclipse.efm.modeling.targetplatform.neon-papyrusnightly/org.eclipse.efm.modeling.targetplatform.neon-papyrusnightly.target
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde?>
-<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Neon Nightly" sequenceNumber="1458824765">
- <locations>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
- <repository id="eclipse-neon" location="http://download.eclipse.org/releases/neon/"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.xtext.sdk.feature.group" version="2.10.0.v201605250459"/>
- <unit id="org.eclipse.xtend.sdk.feature.group" version="2.10.0.v201605250459"/>
- <unit id="org.eclipse.xtext.redist.feature.group" version="2.10.0.v201605250459"/>
- <repository id="xtext" location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.10.0/"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
- <repository id="eclipse-papyrus-nighlty-neon" location="http://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/neon/main/"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.papyrus.designer.languages.common.feature.feature.group" version="0.0.0"/>
- <!--unit id="org.eclipse.papyrus.designer.languages.cpp.feature.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.papyrus.designer.languages.main.feature.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.papyrus.designer.languages.tracing.feature.feature.group" version="0.0.0"/-->
- <repository id="eclipse-papyrus-designer-nighlty-neon" location="http://download.eclipse.org/modeling/mdt/papyrus/components/designer/"/>
- </location>
- </locations>
-</target>
diff --git a/targetplatform/org.eclipse.efm.modeling.targetplatform.neon/org.eclipse.efm.modeling.targetplatform.neon.target b/targetplatform/org.eclipse.efm.modeling.targetplatform.neon/org.eclipse.efm.modeling.targetplatform.neon.target
index d5bd8e0..7c29a24 100644
--- a/targetplatform/org.eclipse.efm.modeling.targetplatform.neon/org.eclipse.efm.modeling.targetplatform.neon.target
+++ b/targetplatform/org.eclipse.efm.modeling.targetplatform.neon/org.eclipse.efm.modeling.targetplatform.neon.target
@@ -1,17 +1,26 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde?>
-<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Papyrus Neon" sequenceNumber="1462889130">
- <locations>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.ocl.uml.feature.group" version="0.0.0"/>
- <repository id="eclipse-neon" location="http://download.eclipse.org/releases/neon/"/>
- </location>
- </locations>
-</target>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?><target name="Eclipse Formal Modeling Neon" sequenceNumber="1462889135">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.xtext.sdk.feature.group" version="2.10.0.v201605250459"/>
+<unit id="org.eclipse.xtext.redist.feature.group" version="2.10.0.v201605250459"/>
+<unit id="org.eclipse.xtend.sdk.feature.group" version="2.10.0.v201605250459"/>
+<unit id="org.eclipse.xtend.gwt.feature.group" version="2.10.0.v201605250459"/>
+<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.10.0/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.papyrus.sdk.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.ocl.uml.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/releases/neon/"/>
+</location>
+</locations>
+<environment>
+<os>win32</os>
+<arch>x86_64</arch>
+</environment>
+</target>
diff --git a/targetplatform/org.eclipse.efm.modeling.targetplatform.neon/org.eclipse.efm.modeling.targetplatform.neon.tpd b/targetplatform/org.eclipse.efm.modeling.targetplatform.neon/org.eclipse.efm.modeling.targetplatform.neon.tpd
index 9a4f069..91a8d34 100644
--- a/targetplatform/org.eclipse.efm.modeling.targetplatform.neon/org.eclipse.efm.modeling.targetplatform.neon.tpd
+++ b/targetplatform/org.eclipse.efm.modeling.targetplatform.neon/org.eclipse.efm.modeling.targetplatform.neon.tpd
@@ -1,4 +1,4 @@
-target "Papyrus Neon" with source requirements
+target "Eclipse Formal Modeling Neon" source requirements
location "http://download.eclipse.org/releases/neon/" eclipse-neon {
org.eclipse.platform.feature.group lazy
diff --git a/targetplatform/org.eclipse.efm.modeling.targetplatform.neon/pom.xml b/targetplatform/org.eclipse.efm.modeling.targetplatform.neon/pom.xml
index 302d4d2..feba1d1 100644
--- a/targetplatform/org.eclipse.efm.modeling.targetplatform.neon/pom.xml
+++ b/targetplatform/org.eclipse.efm.modeling.targetplatform.neon/pom.xml
@@ -9,5 +9,5 @@
<artifactId>org.eclipse.efm.modeling.targetplatform.neon</artifactId>
<packaging>eclipse-target-definition</packaging>
<name>org.eclipse.efm.modeling.targetplatform.neon</name>
- <description>This plug-in contains the target definition for Papyrus org.eclipse.efm-modeling in Neon.</description>
+ <description>This plug-in contains the target definition for Eclipse Formal Modeling in Neon.</description>
</project>
\ No newline at end of file
diff --git a/targetplatform/pom.xml b/targetplatform/pom.xml
index e75d04b..badac09 100644
--- a/targetplatform/pom.xml
+++ b/targetplatform/pom.xml
@@ -13,12 +13,21 @@
<description>This module contains the different Eclipse target platform definitions.</description>
<profiles>
<profile>
- <id>neon-papyrusnightly</id>
+ <id>neon</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<modules>
- <module>org.eclipse.efm.modeling.targetplatform.neon-papyrusnightly</module>
+ <module>org.eclipse.efm.modeling.targetplatform.neon</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>neon-papyrus</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>org.eclipse.efm.modeling.targetplatform.neon-papyrus</module>
</modules>
</profile>
</profiles>
