Improve setup related models

3 files changed, 23 insertions, 10 deletions

diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/model/Configuration.setup b/plugins/org.eclipse.emf.cdo.releng.setup/model/Configuration.setup
index 323299947b..2e00a36642 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup/model/Configuration.setup
+++ b/plugins/org.eclipse.emf.cdo.releng.setup/model/Configuration.setup
@@ -27,15 +27,18 @@
     <setupTasks xsi:type="setup:EclipsePreferenceTask" key="/instance/org.eclipse.ui.ide/WORKSPACE_NAME" value="${setup.project.name} ${setup.branch.name|cap}"/>
   </eclipseVersions>
   <eclipseVersions version="4.4">
-    <setupTasks xsi:type="setup:P2Task">
-      <p2Repositories url="http://download.eclipse.org/releases/luna"/>
+    <setupTasks xsi:type="setup:StringVariableTask" name="train.name" value="Luna" description="The name of the release train"/>
+    <setupTasks xsi:type="setup:StringVariableTask" requirements="//@eclipseVersions.2/@setupTasks.0" name="train.url" value="http://download.eclipse.org/releases/${train.name|lower}" description="The URL of the release train p2 repository"/>
+    <setupTasks xsi:type="setup:StringVariableTask" requirements="//@eclipseVersions.2/@setupTasks.1" name="platform.url" value="${train.url}" description="The location of the Eclipse SDK's p2 repository"/>
+    <setupTasks xsi:type="setup:P2Task" requirements="//@eclipseVersions.2/@setupTasks.2">
+      <p2Repositories url="${platform.url}"/>
       <p2Repositories url="${releng.url}"/>
       <installableUnits id="org.eclipse.sdk.ide"/>
       <installableUnits id="org.eclipse.emf.cdo.releng.setup.feature.group"/>
     </setupTasks>
-    <setupTasks xsi:type="setup:EclipseIniTask" requirements="//@eclipseVersions.2/@setupTasks.0" option="--launcher.XXMaxPermSize" value="512m"/>
-    <setupTasks xsi:type="setup:EclipseIniTask" option="-data" value="${setup.branch.dir/ws}"/>
-    <setupTasks xsi:type="setup:EclipseIniTask" requirements="//@eclipseVersions.2/@setupTasks.0" option="-Dorg.eclipse.emf.cdo.releng.setup.ide" value="=true" vm="true"/>
+    <setupTasks xsi:type="setup:EclipseIniTask" requirements="//@eclipseVersions.2/@setupTasks.3" option="--launcher.XXMaxPermSize" value="512m"/>
+    <setupTasks xsi:type="setup:EclipseIniTask" requirements="//@eclipseVersions.2/@setupTasks.3" option="-data" value="${setup.branch.dir/ws}"/>
+    <setupTasks xsi:type="setup:EclipseIniTask" requirements="//@eclipseVersions.2/@setupTasks.3" option="-Dorg.eclipse.emf.cdo.releng.setup.ide" value="=true" vm="true"/>
     <setupTasks xsi:type="setup:EclipsePreferenceTask" key="/instance/org.eclipse.ui.ide/WORKSPACE_NAME" value="${setup.project.name} ${setup.branch.name|cap}"/>
   </eclipseVersions>
 </setup:Configuration>
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/StringVariableTaskImpl.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/StringVariableTaskImpl.java
index 2d740637a0..be6ad8c1c0 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/StringVariableTaskImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/StringVariableTaskImpl.java
@@ -149,7 +149,9 @@ public class StringVariableTaskImpl extends SetupTaskImpl implements StringVaria
     String oldName = name;
     name = newName;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.STRING_VARIABLE_TASK__NAME, oldName, name));
+    }
   }
 
   /**
@@ -172,7 +174,9 @@ public class StringVariableTaskImpl extends SetupTaskImpl implements StringVaria
     String oldValue = value;
     value = newValue;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.STRING_VARIABLE_TASK__VALUE, oldValue, value));
+    }
   }
 
   /**
@@ -195,8 +199,10 @@ public class StringVariableTaskImpl extends SetupTaskImpl implements StringVaria
     String oldDescription = description;
     description = newDescription;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.STRING_VARIABLE_TASK__DESCRIPTION,
           oldDescription, description));
+    }
   }
 
   /**
@@ -294,7 +300,9 @@ public class StringVariableTaskImpl extends SetupTaskImpl implements StringVaria
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (name: ");
@@ -327,6 +335,8 @@ public class StringVariableTaskImpl extends SetupTaskImpl implements StringVaria
     cachedVariable = variable;
     expandedValue = context.expandString(getValue());
 
+    context.put(getName(), expandedValue);
+
     if (variable == null)
     {
       return true;
diff --git a/plugins/org.eclipse.emf.cdo.releng/local.setup b/plugins/org.eclipse.emf.cdo.releng/local.setup
index 1d45bbfc5f..8d8da35878 100644
--- a/plugins/org.eclipse.emf.cdo.releng/local.setup
+++ b/plugins/org.eclipse.emf.cdo.releng/local.setup
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="ASCII"?>
 <setup:Project xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:predicates="http://www.eclipse.org/CDO/releng/predicates/1.0" xmlns:setup="http://www.eclipse.org/CDO/releng/setup/1.0" name="CDO">
   <setupTasks xsi:type="setup:P2Task">
-    <p2Repositories url="http://download.eclipse.org/releases/luna"/>
-    <p2Repositories url="http://download.eclipse.org/modeling/emf/cdo/updates/integration"/>
     <p2Repositories url="http://download.eclipse.org/tools/buckminster/updates-4.3"/>
     <p2Repositories url="http://download.eclipse.org/egit/updates-nightly"/>
+    <p2Repositories url="${train.url}"/>
+    <p2Repositories url="${releng.url}"/>
     <installableUnits id="org.eclipse.pde.api.tools.ee.feature.feature.group"/>
     <installableUnits id="org.eclipse.emf.cdo.releng.projectcopy.feature.group"/>
     <installableUnits id="org.eclipse.emf.cdo.releng.version.feature.group"/>
@@ -70,20 +70,20 @@
       <installableUnits id="org.eclipse.gmf.sdk.feature.group"/>
     </setupTasks>
     <setupTasks xsi:type="setup:GitCloneTask" name="cdo" remoteURI="ssh://git.eclipse.org:29418/cdo/cdo" checkoutBranch="master"/>
-    <setupTasks xsi:type="setup:StringVariableTask" requirements="//@branches.0/@setupTasks.1" name="git.clone" value="${setup.branch.dir}/git/cdo" description="Location of CDO's Git clone."/>
+    <setupTasks xsi:type="setup:StringVariableTask" requirements="//@branches.0/@setupTasks.1" name="git.clone" value="${setup.branch.dir/git/cdo}" description="Location of CDO's Git clone."/>
     <setupTasks xsi:type="setup:BuckminsterImportTask" requirements="//@branches.0/@setupTasks.2" mspec="${setup.branch.dir|uri}/git/cdo/plugins/org.eclipse.emf.cdo.releng/local.mspec" targetPlatform="${setup.branch.dir}/tp" bundlePool="${setup.install.dir}/.p2pool-tp"/>
     <setupTasks xsi:type="setup:ApiBaselineTask" requirements="//@branches.0/@setupTasks.3" version="4.2" zipLocation="http://sourceforge.net/projects/net4j/files/Baselines/emf-cdo-4.2-baseline.zip/download"/>
   </branches>
   <branches name="4.2">
     <setupTasks xsi:type="setup:P2Task">
-      <p2Repositories url="http://download.eclipse.org/releases/luna"/>
+      <p2Repositories url="http://download.eclipse.org/releases/kepler"/>
       <installableUnits id="org.eclipse.emf.sdk.feature.group"/>
       <installableUnits id="org.eclipse.gmf.runtime.notation.sdk.feature.group"/>
       <installableUnits id="org.eclipse.gmf.runtime.sdk.feature.group"/>
       <installableUnits id="org.eclipse.gmf.sdk.feature.group"/>
     </setupTasks>
     <setupTasks xsi:type="setup:GitCloneTask" name="cdo" remoteURI="ssh://git.eclipse.org:29418/cdo/cdo" checkoutBranch="streams/4.2-maintenance"/>
-    <setupTasks xsi:type="setup:StringVariableTask" requirements="//@branches.1/@setupTasks.1" name="git.clone" value="${setup.branch.dir}/git/cdo" description="Location of CDO's Git clone."/>
+    <setupTasks xsi:type="setup:StringVariableTask" requirements="//@branches.1/@setupTasks.1" name="git.clone" value="${setup.branch.dir/git/cdo}" description="Location of CDO's Git clone."/>
     <setupTasks xsi:type="setup:BuckminsterImportTask" requirements="//@branches.1/@setupTasks.2" mspec="${setup.branch.dir|uri}/git/cdo/plugins/org.eclipse.emf.cdo.releng/local.mspec" targetPlatform="${setup.branch.dir}/tp" bundlePool="${setup.install.dir}/.p2pool-tp"/>
     <setupTasks xsi:type="setup:ApiBaselineTask" requirements="//@branches.1/@setupTasks.3" version="4.2" zipLocation="http://sourceforge.net/projects/net4j/files/Baselines/emf-cdo-4.2-baseline.zip/download"/>
   </branches>