Remove optional setup tasks from local.setup

3 files changed, 23 insertions, 4 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 71d2d5c653..8828d87d76 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup/model/Configuration.setup
+++ b/plugins/org.eclipse.emf.cdo.releng.setup/model/Configuration.setup
@@ -10,7 +10,9 @@
       <installableUnits id="org.eclipse.emf.cdo.releng.setup.editor.feature.group"/>
     </setupTasks>
     <setupTasks xsi:type="setup:EclipseIniTask" requirements="//@eclipseVersions.0/@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.0/@setupTasks.0" 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>
   <eclipseVersions version="4.3">
     <setupTasks xsi:type="setup:P2Task">
@@ -20,7 +22,9 @@
       <installableUnits id="org.eclipse.emf.cdo.releng.setup.editor.feature.group"/>
     </setupTasks>
     <setupTasks xsi:type="setup:EclipseIniTask" requirements="//@eclipseVersions.1/@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.1/@setupTasks.0" 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>
   <eclipseVersions version="4.4">
     <setupTasks xsi:type="setup:P2Task">
@@ -30,6 +34,8 @@
       <installableUnits id="org.eclipse.emf.cdo.releng.setup.editor.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: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/internal/setup/SetupTaskPerformer.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/internal/setup/SetupTaskPerformer.java
index bc639dece5..00e0926839 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/internal/setup/SetupTaskPerformer.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/internal/setup/SetupTaskPerformer.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.cdo.releng.setup.util.OS;
 import org.eclipse.emf.cdo.releng.setup.util.log.ProgressLog;
 import org.eclipse.emf.cdo.releng.setup.util.log.ProgressLogRunnable;
 
+import org.eclipse.net4j.util.StringUtil;
 import org.eclipse.net4j.util.io.IOUtil;
 
 import org.eclipse.emf.common.util.BasicEList;
@@ -594,6 +595,22 @@ public class SetupTaskPerformer extends HashMap<Object, Object> implements Setup
         return value.toLowerCase();
       }
     });
+
+    STRING_FILTER_REGISTRY.put("cap", new StringFilter()
+    {
+      public String filter(String value)
+      {
+        return StringUtil.cap(value);
+      }
+    });
+
+    STRING_FILTER_REGISTRY.put("allcap", new StringFilter()
+    {
+      public String filter(String value)
+      {
+        return StringUtil.capAll(value);
+      }
+    });
   }
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.releng/local.setup b/plugins/org.eclipse.emf.cdo.releng/local.setup
index dee30ec385..562e8e571a 100644
--- a/plugins/org.eclipse.emf.cdo.releng/local.setup
+++ b/plugins/org.eclipse.emf.cdo.releng/local.setup
@@ -6,17 +6,13 @@
     <p2Repositories url="http://download.eclipse.org/tools/buckminster/updates-4.3"/>
     <p2Repositories url="http://download.eclipse.org/egit/updates-nightly"/>
     <installableUnits id="org.eclipse.pde.api.tools.ee.feature.feature.group"/>
-    <installableUnits id="org.eclipse.emf.cdo.releng.launches.feature.group"/>
-    <installableUnits id="org.eclipse.emf.cdo.releng.manifests.feature.group"/>
     <installableUnits id="org.eclipse.emf.cdo.releng.projectcopy.feature.group"/>
-    <installableUnits id="org.eclipse.emf.cdo.releng.relativepaths.feature.group"/>
     <installableUnits id="org.eclipse.emf.cdo.releng.version.feature.group"/>
     <installableUnits id="org.eclipse.egit.feature.group"/>
     <installableUnits id="org.eclipse.buckminster.core.feature.feature.group"/>
     <installableUnits id="org.eclipse.buckminster.git.feature.feature.group"/>
     <installableUnits id="org.eclipse.buckminster.pde.feature.feature.group"/>
   </setupTasks>
-  <setupTasks xsi:type="setup:EclipseIniTask" option="-data" value="${setup.branch.dir}/ws"/>
   <setupTasks xsi:type="setup:EclipseIniTask" option="-Djgit.gitprefix" value="=${setup.git.prefix}" vm="true"/>
   <setupTasks xsi:type="setup:EclipseIniTask" option="-Dorg.eclipse.buckminster.core.bundle.pool" value="=${setup.install.dir}/.p2pool-tp" vm="true"/>
   <setupTasks xsi:type="setup:EclipseIniTask" option="-Xmx" value="2048m" vm="true"/>