Improve setup related models

Change-Id: I08d568b1e13f20e7cd63027d4ab10eaffec84ae7
Signed-off-by: Ed Merks <ed.merks@gmail.com>

6 files changed, 331 insertions, 249 deletions

diff --git a/plugins/org.eclipse.emf.cdo.releng.predicates/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.releng.predicates/META-INF/MANIFEST.MF
index 90f473b2ad..06175a96ee 100644
--- a/plugins/org.eclipse.emf.cdo.releng.predicates/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.releng.predicates/META-INF/MANIFEST.MF
@@ -7,10 +7,10 @@ Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emf.ecore;visibility:=reexport;bundle-version="[2.9.0,3.0.0)",
- org.eclipse.core.resources;visibility:=reexport;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.team.core;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.egit.core;bundle-version="[3.0.1,5.0.0)"
+ org.eclipse.emf.ecore;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
+ org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
+ org.eclipse.team.core;bundle-version="[3.7.0,4.0.0)";resolution:=optional,
+ org.eclipse.egit.core;bundle-version="[3.0.1,5.0.0)";resolution:=optional
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.emf.cdo.releng.predicates;version="1.0.200",
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.product/Setup Dialog.launch b/plugins/org.eclipse.emf.cdo.releng.setup.product/Setup Dialog.launch
index 83f377a58e..2a5a6b5979 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.product/Setup Dialog.launch
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.product/Setup Dialog.launch
@@ -12,7 +12,7 @@
 <booleanAttribute key="clearwslog" value="false"/>
 <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Setup Dialog"/>
 <booleanAttribute key="default" value="false"/>
-<booleanAttribute key="includeOptional" value="true"/>
+<booleanAttribute key="includeOptional" value="false"/>
 <stringAttribute key="location" value="D:\sandbox\tmp6\cdo\master\ws.setup.dialog"/>
 <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
 <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
@@ -25,9 +25,9 @@
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.p2.mirrors=false -Declipse.p2.unsignedPolicy=allow -Xms1024m -Xmx2500m -Dreleng.url=file:/${workspace_loc}/org.eclipse.emf.cdo.releng.setup.update -Dsetup.uri=file://${resource_loc:/org.eclipse.emf.cdo.releng.setup/model/Configuration.setup}"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.eclipse.emf.cdo.releng.setup.product.ide"/>
-<stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,com.jcraft.jsch@default:default,javaewah@default:default,javax.annotation@default:default,javax.inject@default:default,javax.servlet@default:default,javax.xml@default:default,org.apache.ant@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.codec@default:default,org.apache.commons.logging@default:default,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.eclipse.ant.core@default:default,org.eclipse.buckminster.ant@default:default,org.eclipse.buckminster.cmdline@default:default,org.eclipse.buckminster.core@default:default,org.eclipse.buckminster.download@default:default,org.eclipse.buckminster.jarprocessor@default:default,org.eclipse.buckminster.jdt@default:default,org.eclipse.buckminster.osgi.filter@default:default,org.eclipse.buckminster.pde@default:default,org.eclipse.buckminster.runtime@default:default,org.eclipse.buckminster.sax@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.resources.win32.x86_64@default:false,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.httpclient4.ssl@default:false,org.eclipse.ecf.provider.filetransfer.httpclient4@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.egit.core@default:default,org.eclipse.egit.ui@default:default,org.eclipse.egit@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security.win32.x86_64@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.help@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.jgit@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.api.tools@default:default,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.search@default:default,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.win32@default:false,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.update.configurator@3:true,org.objectweb.asm@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.w3c.css.sac@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.ecore.retrofit@default:false,org.eclipse.emf.cdo.releng.predicates.edit@default:default,org.eclipse.emf.cdo.releng.predicates@default:default,org.eclipse.emf.cdo.releng.setup.edit@default:default,org.eclipse.emf.cdo.releng.setup.editor.rcp@default:default,org.eclipse.emf.cdo.releng.setup.editor@default:default,org.eclipse.emf.cdo.releng.setup.product@default:default,org.eclipse.emf.cdo.releng.setup@default:default,org.eclipse.emf.cdo.releng.workingsets.edit@default:default,org.eclipse.emf.cdo.releng.workingsets@default:default,org.eclipse.net4j.util@default:default"/>
-<booleanAttribute key="show_selected_only" value="false"/>
+<stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,javax.annotation@default:default,javax.inject@default:default,javax.xml@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.codec@default:default,org.apache.commons.logging@default:default,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.eclipse.ant.core@default:default,org.eclipse.compare.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.resources.win32.x86_64@default:false,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.httpclient4.ssl@default:false,org.eclipse.ecf.provider.filetransfer.httpclient4@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.win32.x86_64@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.help@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.w3c.css.sac@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.ecore.retrofit@default:false,org.eclipse.emf.cdo.releng.predicates.edit@default:default,org.eclipse.emf.cdo.releng.predicates@default:default,org.eclipse.emf.cdo.releng.setup.edit@default:default,org.eclipse.emf.cdo.releng.setup.editor.rcp@default:default,org.eclipse.emf.cdo.releng.setup.product@default:default,org.eclipse.emf.cdo.releng.setup@default:default,org.eclipse.emf.cdo.releng.workingsets.edit@default:default,org.eclipse.emf.cdo.releng.workingsets@default:default,org.eclipse.net4j.util@default:default"/>
+<booleanAttribute key="show_selected_only" value="true"/>
 <stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
 <booleanAttribute key="tracing" value="true"/>
 <mapAttribute key="tracingOptions">
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.releng.setup/META-INF/MANIFEST.MF
index 200fb3f7ec..b1722d1fc2 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.releng.setup/META-INF/MANIFEST.MF
@@ -8,43 +8,49 @@ Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.net4j.util;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emf.cdo.releng.workingsets;visibility:=reexport;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.cdo.releng.predicates;visibility:=reexport;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.ecore;visibility:=reexport;bundle-version="[2.5.0,3.0.0)",
+ org.eclipse.emf.cdo.releng.workingsets;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.cdo.releng.predicates;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.xmi;bundle-version="[2.5.0,3.0.0)",
- org.eclipse.core.resources;resolution:=optional;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.core.variables;resolution:=optional;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.pde.core;resolution:=optional;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.pde.api.tools;resolution:=optional;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.team.ui;resolution:=optional;bundle-version="[3.5.0,4.0.0)",
- javaewah;resolution:=optional;bundle-version="[0.0.0,1.0.0)",
- org.eclipse.jgit;resolution:=optional;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.egit;resolution:=optional;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.egit.core;resolution:=optional;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.egit.ui;resolution:=optional;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.emf.edit.ui;resolution:=optional;bundle-version="[2.5.0,3.0.0)",
- org.eclipse.ecf.provider.filetransfer;resolution:=optional;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ecf.filetransfer;resolution:=optional;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.ecf.identity;resolution:=optional;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ecf;resolution:=optional;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.buckminster.sax;resolution:=optional;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.buckminster.cmdline;resolution:=optional;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.buckminster.download;resolution:=optional;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.buckminster.runtime;resolution:=optional;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.buckminster.core;resolution:=optional;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.buckminster.pde;resolution:=optional;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.equinox.p2.core;resolution:=optional;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.equinox.p2.ui;resolution:=optional;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.equinox.p2.metadata;resolution:=optional;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.equinox.p2.repository;resolution:=optional;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.equinox.p2.artifact.repository;resolution:=optional;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.equinox.p2.metadata.repository;resolution:=optional;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.equinox.p2.console;resolution:=optional;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.equinox.p2.publisher;resolution:=optional;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.equinox.p2.publisher.eclipse;resolution:=optional;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.equinox.p2.director.app;resolution:=optional;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
+ org.eclipse.core.variables;bundle-version="[3.0.0,4.0.0)";resolution:=optional,
+ org.eclipse.pde.core;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
+ org.eclipse.pde.api.tools;bundle-version="[1.0.0,2.0.0)";resolution:=optional,
+ org.eclipse.team.ui;bundle-version="[3.5.0,4.0.0)";resolution:=optional,
+ javaewah;bundle-version="[0.0.0,1.0.0)";resolution:=optional,
+ org.eclipse.jgit;bundle-version="[3.0.0,4.0.0)";resolution:=optional,
+ org.eclipse.egit;bundle-version="[3.0.0,4.0.0)";resolution:=optional,
+ org.eclipse.egit.core;bundle-version="[3.0.0,4.0.0)";resolution:=optional,
+ org.eclipse.egit.ui;bundle-version="[3.0.0,4.0.0)";resolution:=optional,
+ org.eclipse.emf.edit.ui;bundle-version="[2.5.0,3.0.0)";resolution:=optional,
+ org.eclipse.ecf.provider.filetransfer;bundle-version="[3.2.0,4.0.0)";resolution:=optional,
+ org.eclipse.ecf.filetransfer;bundle-version="[5.0.0,6.0.0)";resolution:=optional,
+ org.eclipse.ecf.identity;bundle-version="[3.2.0,4.0.0)";resolution:=optional,
+ org.eclipse.ecf;bundle-version="[3.2.0,4.0.0)";resolution:=optional,
+ org.eclipse.buckminster.sax;bundle-version="[1.0.0,2.0.0)";resolution:=optional,
+ org.eclipse.buckminster.cmdline;bundle-version="[1.0.0,2.0.0)";resolution:=optional,
+ org.eclipse.buckminster.download;bundle-version="[1.0.0,2.0.0)";resolution:=optional,
+ org.eclipse.buckminster.runtime;bundle-version="[1.0.0,2.0.0)";resolution:=optional,
+ org.eclipse.buckminster.core;bundle-version="[1.0.0,2.0.0)";resolution:=optional,
+ org.eclipse.buckminster.pde;bundle-version="[1.0.0,2.0.0)";resolution:=optional,
+ org.eclipse.equinox.p2.core;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.equinox.p2.ui;bundle-version="[2.0.0,3.0.0)";resolution:=optional,
+ org.eclipse.equinox.p2.metadata;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.equinox.p2.repository;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.equinox.p2.artifact.repository;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.equinox.p2.metadata.repository;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.equinox.p2.console;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.equinox.p2.publisher;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.equinox.p2.publisher.eclipse;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.equinox.p2.director.app;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.equinox.p2.operations;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.equinox.p2.engine;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.equinox.p2.engine;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.equinox.p2.transport.ecf;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.ecf.provider.filetransfer.httpclient4;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.core.net;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.equinox.p2.touchpoint.eclipse;bundle-version="[2.1.0,3.0.0)",
+ org.eclipse.equinox.p2.touchpoint.natives;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.equinox.p2.updatesite;bundle-version="[1.0.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.emf.cdo.releng.internal.setup;x-friends:="org.eclipse.emf.cdo.releng.setup.product,org.eclipse.emf.cdo.releng.setup.editor";version="1.0.0",
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/Setup IDE.launch b/plugins/org.eclipse.emf.cdo.releng.setup/Setup IDE.launch
index 1efc5454b4..39c738d644 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup/Setup IDE.launch
+++ b/plugins/org.eclipse.emf.cdo.releng.setup/Setup IDE.launch
@@ -13,7 +13,7 @@
 <booleanAttribute key="default" value="false"/>
 <booleanAttribute key="generateProfile" value="true"/>
 <booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="D:\sandbox\tmp7\cdo\master\ws"/>
+<stringAttribute key="location" value="D:\sandbox\tmp8\emf\master\ws"/>
 <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
 <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
 <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
@@ -22,11 +22,11 @@
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.p2.mirrors=false -Declipse.p2.unsignedPolicy=allow -Xms1024m -Xmx2500m -XX:MaxPermSize=512m&#13;&#10;-Dorg.eclipse.emf.cdo.releng.setup.ide=true&#13;&#10;&quot;-Djgit.gitprefix=C:\Program Files (x86)\Git&quot;&#13;&#10;-Dorg.eclipse.buckminster.core.bundle.pool=D:/sandbox/tmp7/.p2pool-tp"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.p2.mirrors=false -Declipse.p2.unsignedPolicy=allow -Xms1024m -Xmx2500m -XX:MaxPermSize=512m&#13;&#10;-Dorg.eclipse.emf.cdo.releng.setup.ide=true&#13;&#10;&quot;-Djgit.gitprefix=C:\Program Files (x86)\Git&quot;&#13;&#10;-Dorg.eclipse.buckminster.core.bundle.pool=D:/sandbox/tmp8/.p2pool-tp"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,com.jcraft.jsch@default:default,javaewah@default:default,javax.annotation@default:default,javax.inject@default:default,javax.servlet@default:default,javax.xml@default:default,org.apache.ant@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.codec@default:default,org.apache.commons.logging@default:default,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.buckminster.ant@default:default,org.eclipse.buckminster.cmdline@default:default,org.eclipse.buckminster.core@default:default,org.eclipse.buckminster.download@default:default,org.eclipse.buckminster.executor@default:default,org.eclipse.buckminster.fetcher@default:default,org.eclipse.buckminster.generic.ui@default:default,org.eclipse.buckminster.generic@default:default,org.eclipse.buckminster.git@default:default,org.eclipse.buckminster.installer@default:default,org.eclipse.buckminster.jarprocessor@default:default,org.eclipse.buckminster.jdt@default:default,org.eclipse.buckminster.junit@default:default,org.eclipse.buckminster.model.common.edit@default:default,org.eclipse.buckminster.model.common@default:default,org.eclipse.buckminster.mspec.edit@default:default,org.eclipse.buckminster.mspec.editor@default:default,org.eclipse.buckminster.mspec@default:default,org.eclipse.buckminster.osgi.filter@default:default,org.eclipse.buckminster.pde.ui@default:default,org.eclipse.buckminster.pde@default:default,org.eclipse.buckminster.rmap.edit@default:default,org.eclipse.buckminster.rmap.editor@default:default,org.eclipse.buckminster.rmap.pde.edit@default:default,org.eclipse.buckminster.rmap.pde@default:default,org.eclipse.buckminster.rmap@default:default,org.eclipse.buckminster.runtime@default:default,org.eclipse.buckminster.sax@default:default,org.eclipse.buckminster.ui@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.resources.win32.x86_64@default:false,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.httpclient4.ssl@default:false,org.eclipse.ecf.provider.filetransfer.httpclient4@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.egit.core@default:default,org.eclipse.egit.fetchfactory@default:default,org.eclipse.egit.ui@default:default,org.eclipse.egit@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,org.eclipse.equinox.p2.ui.importexport@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security.win32.x86_64@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.jgit@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.api.tools.ui@default:default,org.eclipse.pde.api.tools@default:default,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde.ds.core@default:default,org.eclipse.pde.ds.ui@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.pde.launching@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.pde.ua.core@default:default,org.eclipse.pde.ua.ui@default:default,org.eclipse.pde.ui@default:default,org.eclipse.pde@default:default,org.eclipse.platform@default:default,org.eclipse.search@default:default,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.browser@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.net@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.win32@default:false,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.update.configurator@3:true,org.hamcrest.core@default:default,org.junit@default:default,org.objectweb.asm@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.w3c.css.sac@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.ecore.retrofit@default:false,org.eclipse.emf.cdo.releng.predicates.edit@default:default,org.eclipse.emf.cdo.releng.predicates@default:default,org.eclipse.emf.cdo.releng.preferences.edit@default:default,org.eclipse.emf.cdo.releng.preferences.editor@default:default,org.eclipse.emf.cdo.releng.preferences@default:default,org.eclipse.emf.cdo.releng.projectconfig.edit@default:default,org.eclipse.emf.cdo.releng.projectconfig.editor@default:default,org.eclipse.emf.cdo.releng.projectconfig@default:default,org.eclipse.emf.cdo.releng.setup.edit@default:default,org.eclipse.emf.cdo.releng.setup.editor@default:default,org.eclipse.emf.cdo.releng.setup@default:default,org.eclipse.emf.cdo.releng.ui@default:default,org.eclipse.emf.cdo.releng.workingsets.edit@default:default,org.eclipse.emf.cdo.releng.workingsets.editor@default:default,org.eclipse.emf.cdo.releng.workingsets@default:default,org.eclipse.net4j.util@default:default"/>
+<stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,com.jcraft.jsch,javaewah,javax.annotation@default:default,javax.inject@default:default,javax.servlet,javax.xml@default:default,org.apache.ant,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.codec@default:default,org.apache.commons.logging@default:default,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.lucene.analysis,org.apache.lucene.core,org.eclipse.ant.core@default:default,org.eclipse.ant.launching,org.eclipse.ant.ui,org.eclipse.buckminster.ant,org.eclipse.buckminster.cmdline,org.eclipse.buckminster.core,org.eclipse.buckminster.download,org.eclipse.buckminster.executor,org.eclipse.buckminster.fetcher,org.eclipse.buckminster.generic,org.eclipse.buckminster.generic.ui,org.eclipse.buckminster.git,org.eclipse.buckminster.installer,org.eclipse.buckminster.jarprocessor,org.eclipse.buckminster.jdt,org.eclipse.buckminster.junit,org.eclipse.buckminster.model.common,org.eclipse.buckminster.model.common.edit,org.eclipse.buckminster.mspec,org.eclipse.buckminster.mspec.edit,org.eclipse.buckminster.mspec.editor,org.eclipse.buckminster.osgi.filter,org.eclipse.buckminster.pde,org.eclipse.buckminster.pde.ui,org.eclipse.buckminster.rmap,org.eclipse.buckminster.rmap.edit,org.eclipse.buckminster.rmap.editor,org.eclipse.buckminster.rmap.pde,org.eclipse.buckminster.rmap.pde.edit,org.eclipse.buckminster.runtime,org.eclipse.buckminster.sax,org.eclipse.buckminster.ui,org.eclipse.compare,org.eclipse.compare.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.externaltools,org.eclipse.core.filebuffers,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.resources.win32.x86_64@default:false,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility,org.eclipse.core.runtime.compatibility.auth,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.debug.core,org.eclipse.debug.ui,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.httpclient4.ssl@default:false,org.eclipse.ecf.provider.filetransfer.httpclient4@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.egit,org.eclipse.egit.core,org.eclipse.egit.fetchfactory,org.eclipse.egit.ui,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty,org.eclipse.equinox.http.servlet,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.directorywatcher,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.extensionlocation,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.ql,org.eclipse.equinox.p2.reconciler.dropins,org.eclipse.equinox.p2.repository.tools,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,org.eclipse.equinox.p2.ui,org.eclipse.equinox.p2.ui.importexport,org.eclipse.equinox.p2.ui.sdk,org.eclipse.equinox.p2.ui.sdk.scheduler,org.eclipse.equinox.p2.updatechecker,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.ui,org.eclipse.equinox.security.win32.x86_64@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.help.base,org.eclipse.help.ui,org.eclipse.help@default:default,org.eclipse.jdt,org.eclipse.jdt.compiler.apt,org.eclipse.jdt.compiler.tool,org.eclipse.jdt.core,org.eclipse.jdt.core.manipulation,org.eclipse.jdt.debug,org.eclipse.jdt.debug.ui,org.eclipse.jdt.junit,org.eclipse.jdt.junit.core,org.eclipse.jdt.junit.runtime,org.eclipse.jdt.launching,org.eclipse.jdt.ui,org.eclipse.jetty.continuation,org.eclipse.jetty.http,org.eclipse.jetty.io,org.eclipse.jetty.security,org.eclipse.jetty.server,org.eclipse.jetty.servlet,org.eclipse.jetty.util,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text,org.eclipse.jface@default:default,org.eclipse.jgit,org.eclipse.jsch.core,org.eclipse.jsch.ui,org.eclipse.ltk.core.refactoring,org.eclipse.ltk.ui.refactoring,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde,org.eclipse.pde.api.tools,org.eclipse.pde.api.tools.ui,org.eclipse.pde.build,org.eclipse.pde.core,org.eclipse.pde.ds.core,org.eclipse.pde.ds.ui,org.eclipse.pde.junit.runtime,org.eclipse.pde.launching,org.eclipse.pde.runtime,org.eclipse.pde.ua.core,org.eclipse.pde.ua.ui,org.eclipse.pde.ui,org.eclipse.platform,org.eclipse.search,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.ui,org.eclipse.text,org.eclipse.ui.browser,org.eclipse.ui.cheatsheets,org.eclipse.ui.console,org.eclipse.ui.editors,org.eclipse.ui.externaltools,org.eclipse.ui.forms,org.eclipse.ui.ide,org.eclipse.ui.ide.application,org.eclipse.ui.intro,org.eclipse.ui.intro.universal,org.eclipse.ui.navigator,org.eclipse.ui.navigator.resources,org.eclipse.ui.net,org.eclipse.ui.trace,org.eclipse.ui.views.log,org.eclipse.ui.views.properties.tabbed,org.eclipse.ui.views@default:default,org.eclipse.ui.win32,org.eclipse.ui.workbench.texteditor,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.update.configurator,org.hamcrest.core*1.1.0.v20090501071000,org.hamcrest.core*1.3.0.v201303031735,org.junit,org.objectweb.asm,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.w3c.css.sac@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.cdo.ecore.retrofit@default:false,org.eclipse.emf.cdo.releng.predicates.edit@default:default,org.eclipse.emf.cdo.releng.predicates@default:default,org.eclipse.emf.cdo.releng.preferences,org.eclipse.emf.cdo.releng.preferences.edit,org.eclipse.emf.cdo.releng.preferences.editor,org.eclipse.emf.cdo.releng.projectconfig,org.eclipse.emf.cdo.releng.projectconfig.edit,org.eclipse.emf.cdo.releng.projectconfig.editor,org.eclipse.emf.cdo.releng.setup.edit@default:default,org.eclipse.emf.cdo.releng.setup.editor,org.eclipse.emf.cdo.releng.setup@default:default,org.eclipse.emf.cdo.releng.ui,org.eclipse.emf.cdo.releng.workingsets.edit@default:default,org.eclipse.emf.cdo.releng.workingsets.editor,org.eclipse.emf.cdo.releng.workingsets@default:default,org.eclipse.net4j.util@default:default"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
 <booleanAttribute key="tracing" value="false"/>
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/BuckminsterImportTaskImpl.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/BuckminsterImportTaskImpl.java
index 4755b8a631..9c0d25e5f3 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/BuckminsterImportTaskImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/BuckminsterImportTaskImpl.java
@@ -39,6 +39,7 @@ import org.eclipse.equinox.p2.publisher.eclipse.FeaturesAndBundlesPublisherAppli
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Set;
 
@@ -160,8 +161,10 @@ public class BuckminsterImportTaskImpl extends SetupTaskImpl implements Buckmins
     String oldMspec = mspec;
     mspec = newMspec;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.BUCKMINSTER_IMPORT_TASK__MSPEC, oldMspec,
           mspec));
+    }
   }
 
   /**
@@ -184,8 +187,10 @@ public class BuckminsterImportTaskImpl extends SetupTaskImpl implements Buckmins
     String oldTargetPlatform = targetPlatform;
     targetPlatform = newTargetPlatform;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.BUCKMINSTER_IMPORT_TASK__TARGET_PLATFORM,
           oldTargetPlatform, targetPlatform));
+    }
   }
 
   /**
@@ -208,8 +213,10 @@ public class BuckminsterImportTaskImpl extends SetupTaskImpl implements Buckmins
     String oldBundlePool = bundlePool;
     bundlePool = newBundlePool;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.BUCKMINSTER_IMPORT_TASK__BUNDLE_POOL,
           oldBundlePool, bundlePool));
+    }
   }
 
   /**
@@ -308,7 +315,9 @@ public class BuckminsterImportTaskImpl extends SetupTaskImpl implements Buckmins
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (mspec: ");
@@ -362,28 +371,7 @@ public class BuckminsterImportTaskImpl extends SetupTaskImpl implements Buckmins
             .getProject().getName()
             + " Target", true, context);
 
-        URL mSpecURL = new URL(context.expandString(getMspec()));
-        MaterializationSpec mspec = getMSpec(mSpecURL, monitor); // 20 ticks
-        ComponentQuery cquery = getCQuery(mspec.getResolvedURL(), monitor); // 20 ticks
-
-        IResolver resolver = new MainResolver(new ResolutionContext(mspec, cquery));
-        resolver.getContext().setContinueOnError(true);
-
-        monitor.subTask("Resolving components");
-        BillOfMaterials bom = resolver.resolve(MonitorUtils.subMonitor(monitor, 40));
-
-        MaterializationSpecBuilder mspecBuilder = new MaterializationSpecBuilder();
-        mspecBuilder.initFrom(mspec);
-        mspecBuilder.setName(bom.getViewName());
-
-        bom.addMaterializationNodes(mspecBuilder);
-
-        ResolutionContext resolutionContext = new ResolutionContext(bom.getQuery());
-        MaterializationContext materializationContext = new MaterializationContext(bom, mspec, resolutionContext);
-
-        monitor.subTask("Materializing components");
-        MaterializationJob job = new MaterializationJob(materializationContext);
-        job.run(MonitorUtils.subMonitor(monitor, 80));
+        BuckminsterHelper.materialize(context, getMspec(), monitor);
 
         if (tpPoolLock != null)
         {
@@ -491,25 +479,56 @@ public class BuckminsterImportTaskImpl extends SetupTaskImpl implements Buckmins
     publisher.run(args);
   }
 
-  private MaterializationSpec getMSpec(URL mspecURL, IProgressMonitor monitor) throws Exception
+  private static class BuckminsterHelper
   {
-    monitor.subTask("Downloading MSpec");
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    DownloadManager.readInto(mspecURL, null, baos, MonitorUtils.subMonitor(monitor, 20));
+    private static MaterializationSpec getMSpec(URL mspecURL, IProgressMonitor monitor) throws Exception
+    {
+      monitor.subTask("Downloading MSpec");
+      ByteArrayOutputStream baos = new ByteArrayOutputStream();
+      DownloadManager.readInto(mspecURL, null, baos, MonitorUtils.subMonitor(monitor, 20));
+
+      monitor.subTask("Parsing MSpec");
+      IParser<MaterializationSpec> parser = CorePlugin.getDefault().getParserFactory()
+          .getMaterializationSpecParser(true);
+      return parser.parse(mspecURL.toString(), new ByteArrayInputStream(baos.toByteArray()));
+    }
 
-    monitor.subTask("Parsing MSpec");
-    IParser<MaterializationSpec> parser = CorePlugin.getDefault().getParserFactory().getMaterializationSpecParser(true);
-    return parser.parse(mspecURL.toString(), new ByteArrayInputStream(baos.toByteArray()));
-  }
+    private static ComponentQuery getCQuery(URL cqueryURL, IProgressMonitor monitor) throws Exception
+    {
+      monitor.subTask("Downloading CQuery");
+      ByteArrayOutputStream baos = new ByteArrayOutputStream();
+      DownloadManager.readInto(cqueryURL, null, baos, MonitorUtils.subMonitor(monitor, 20));
 
-  private ComponentQuery getCQuery(URL cqueryURL, IProgressMonitor monitor) throws Exception
-  {
-    monitor.subTask("Downloading CQuery");
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    DownloadManager.readInto(cqueryURL, null, baos, MonitorUtils.subMonitor(monitor, 20));
+      monitor.subTask("Parsing CQuery");
+      return ComponentQuery.fromStream(cqueryURL, null, new ByteArrayInputStream(baos.toByteArray()), true);
+    }
+
+    private static void materialize(SetupTaskContext context, String mSpec, IProgressMonitor monitor)
+        throws MalformedURLException, Exception
+    {
+      URL mSpecURL = new URL(context.expandString(mSpec));
+      MaterializationSpec mspec = BuckminsterHelper.getMSpec(mSpecURL, monitor); // 20 ticks
+      ComponentQuery cquery = BuckminsterHelper.getCQuery(mspec.getResolvedURL(), monitor); // 20 ticks
+
+      IResolver resolver = new MainResolver(new ResolutionContext(mspec, cquery));
+      resolver.getContext().setContinueOnError(true);
+
+      monitor.subTask("Resolving components");
+      BillOfMaterials bom = resolver.resolve(MonitorUtils.subMonitor(monitor, 40));
+
+      MaterializationSpecBuilder mspecBuilder = new MaterializationSpecBuilder();
+      mspecBuilder.initFrom(mspec);
+      mspecBuilder.setName(bom.getViewName());
 
-    monitor.subTask("Parsing CQuery");
-    return ComponentQuery.fromStream(cqueryURL, null, new ByteArrayInputStream(baos.toByteArray()), true);
+      bom.addMaterializationNodes(mspecBuilder);
+
+      ResolutionContext resolutionContext = new ResolutionContext(bom.getQuery());
+      MaterializationContext materializationContext = new MaterializationContext(bom, mspec, resolutionContext);
+
+      monitor.subTask("Materializing components");
+      MaterializationJob job = new MaterializationJob(materializationContext);
+      job.run(MonitorUtils.subMonitor(monitor, 80));
+    }
   }
 
 } // BuckminsterImportTaskImpl
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/GitCloneTaskImpl.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/GitCloneTaskImpl.java
index 1dfbf1aa87..a5ec45b520 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/GitCloneTaskImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/GitCloneTaskImpl.java
@@ -134,13 +134,7 @@ public class GitCloneTaskImpl extends SetupTaskImpl implements GitCloneTask
    */
   protected String checkoutBranch = CHECKOUT_BRANCH_EDEFAULT;
 
-  private transient Object cachedGit;
-
-  private transient Object cachedRepository;
-
-  private transient File workDir;
-
-  private transient boolean hasCheckout;
+  private transient GitDelegate gitDelegate;
 
   /**
    * <!-- begin-user-doc -->
@@ -183,7 +177,9 @@ public class GitCloneTaskImpl extends SetupTaskImpl implements GitCloneTask
     String oldName = name;
     name = newName;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.GIT_CLONE_TASK__NAME, oldName, name));
+    }
   }
 
   /**
@@ -206,8 +202,10 @@ public class GitCloneTaskImpl extends SetupTaskImpl implements GitCloneTask
     String oldRemoteName = remoteName;
     remoteName = newRemoteName;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.GIT_CLONE_TASK__REMOTE_NAME, oldRemoteName,
           remoteName));
+    }
   }
 
   /**
@@ -230,8 +228,10 @@ public class GitCloneTaskImpl extends SetupTaskImpl implements GitCloneTask
     String oldRemoteURI = remoteURI;
     remoteURI = newRemoteURI;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.GIT_CLONE_TASK__REMOTE_URI, oldRemoteURI,
           remoteURI));
+    }
   }
 
   /**
@@ -254,8 +254,10 @@ public class GitCloneTaskImpl extends SetupTaskImpl implements GitCloneTask
     String oldCheckoutBranch = checkoutBranch;
     checkoutBranch = newCheckoutBranch;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.GIT_CLONE_TASK__CHECKOUT_BRANCH,
           oldCheckoutBranch, checkoutBranch));
+    }
   }
 
   /**
@@ -364,7 +366,9 @@ public class GitCloneTaskImpl extends SetupTaskImpl implements GitCloneTask
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (name: ");
@@ -387,228 +391,281 @@ public class GitCloneTaskImpl extends SetupTaskImpl implements GitCloneTask
 
   public boolean isNeeded(SetupTaskContext context) throws Exception
   {
-    workDir = getWorkDir(context);
-    if (!workDir.isDirectory())
-    {
-      return true;
-    }
-
-    context.log("Opening Git clone " + workDir);
-
-    Git git = Git.open(workDir);
-    if (!hasWorkTree(git))
-    {
-      FileUtil.rename(workDir);
-      return true;
-    }
-
-    Repository repository = git.getRepository();
-    configureRepository(context, repository);
-
-    hasCheckout = repository.getAllRefs().containsKey("refs/heads/" + getCheckoutBranch());
-    if (!hasCheckout)
-    {
-      cachedGit = git;
-      cachedRepository = repository;
-      return true;
-    }
-
-    return false;
+    gitDelegate = GitUtil.create();
+    return gitDelegate.isNeeded(context, getName(), getCheckoutBranch(), getRemoteName());
   }
 
   public void perform(SetupTaskContext context) throws Exception
   {
-    Git git = (Git)cachedGit;
-    Repository repository = (Repository)cachedRepository;
-
-    if (git == null)
+    if (gitDelegate != null)
     {
-      git = cloneRepository(context, workDir, getCheckoutBranch());
-      repository = git.getRepository();
-      configureRepository(context, repository);
-    }
-
-    if (!hasCheckout)
-    {
-      createBranch(context, git, getCheckoutBranch());
-      checkout(context, git, getCheckoutBranch());
-      resetHard(context, git);
+      gitDelegate.perform(context, getCheckoutBranch(), getRemoteName(), getRemoteURI());
     }
   }
 
   @Override
   public void dispose()
   {
-    if (cachedRepository != null)
+    if (gitDelegate != null)
     {
-      ((Repository)cachedRepository).close();
+      gitDelegate.dispose();
+      gitDelegate = null;
     }
   }
 
-  private File getWorkDir(SetupTaskContext context)
+  private interface GitDelegate
   {
-    File gitDir = new File(context.getBranchDir(), "git");
-    return new File(gitDir, getName());
-  }
+    public boolean isNeeded(SetupTaskContext context, String name, String checkoutBranch, String remoteName)
+        throws Exception;
 
-  private boolean hasWorkTree(Git git) throws Exception
-  {
-    try
-    {
-      StatusCommand statusCommand = git.status();
-      statusCommand.call();
-      return true;
-    }
-    catch (NoWorkTreeException ex)
-    {
-      return false;
-    }
-  }
+    public void perform(SetupTaskContext context, String checkoutBranch, String remoteName, String remoteURI)
+        throws Exception;
 
-  private Git cloneRepository(SetupTaskContext context, File workDir, String checkoutBranch) throws Exception
-  {
-    URI baseURI = URI.createURI(getRemoteURI());
-    String remote = URI.createHierarchicalURI(baseURI.scheme(),
-        context.getSetup().getPreferences().getUserName() + "@" + baseURI.authority(), baseURI.device(),
-        baseURI.segments(), baseURI.query(), baseURI.fragment()).toString();
-
-    context.log("Cloning Git repo " + remote + " to " + workDir);
-
-    CloneCommand command = Git.cloneRepository();
-    command.setNoCheckout(true);
-    command.setURI(remote);
-    command.setRemote(getRemoteName());
-    command.setBranchesToClone(Collections.singleton(checkoutBranch));
-    command.setDirectory(workDir);
-    command.setTimeout(10);
-    command.setProgressMonitor(new ProgressLogWrapper(context));
-    return command.call();
+    public void dispose();
   }
 
-  private void configureRepository(SetupTaskContext context, Repository repository) throws Exception, IOException
+  private static class GitUtil implements GitDelegate
   {
-    StoredConfig config = repository.getConfig();
+    private File workDir;
+
+    private boolean hasCheckout;
 
-    boolean changed = false;
-    changed |= configureLineEndingConversion(context, config);
-    changed |= addPushRefSpec(context, config);
-    if (changed)
+    private Git cachedGit;
+
+    private Repository cachedRepository;
+
+    private static GitDelegate create()
     {
-      config.save();
+      return new GitUtil();
     }
-  }
 
-  private boolean configureLineEndingConversion(SetupTaskContext context, StoredConfig config) throws Exception
-  {
-    if (context.getOS().isLineEndingConversionNeeded())
+    public boolean isNeeded(SetupTaskContext context, String name, String checkoutBranch, String remoteName)
+        throws Exception
     {
-      context.log("Setting " + ConfigConstants.CONFIG_KEY_AUTOCRLF + " = true");
-      config.setEnum(ConfigConstants.CONFIG_CORE_SECTION, null, ConfigConstants.CONFIG_KEY_AUTOCRLF, AutoCRLF.TRUE);
-      return true;
-    }
+      workDir = getWorkDir(context, name);
+      if (!workDir.isDirectory())
+      {
+        return true;
+      }
 
-    return false;
-  }
+      context.log("Opening Git clone " + workDir);
 
-  private boolean addPushRefSpec(SetupTaskContext context, StoredConfig config) throws Exception
-  {
-    String gerritQueue = "refs/for/" + getCheckoutBranch();
-    for (RemoteConfig remoteConfig : RemoteConfig.getAllRemoteConfigs(config))
-    {
-      if (getRemoteName().equals(remoteConfig.getName()))
+      Git git = Git.open(workDir);
+      if (!GitUtil.hasWorkTree(git))
       {
-        List<RefSpec> pushRefSpecs = remoteConfig.getPushRefSpecs();
-        if (hasGerritPushRefSpec(pushRefSpecs, gerritQueue))
-        {
-          return false;
-        }
+        FileUtil.rename(workDir);
+        return true;
+      }
 
-        RefSpec refSpec = new RefSpec("HEAD:" + gerritQueue);
-        context.log("Adding push ref spec: " + refSpec);
+      Repository repository = git.getRepository();
+      GitUtil.configureRepository(context, repository, checkoutBranch, remoteName);
 
-        remoteConfig.addPushRefSpec(refSpec);
-        remoteConfig.update(config);
+      hasCheckout = repository.getAllRefs().containsKey("refs/heads/" + checkoutBranch);
+      if (!hasCheckout)
+      {
+        cachedGit = git;
+        cachedRepository = repository;
         return true;
       }
-    }
 
-    return false;
-  }
+      return false;
+    }
 
-  private boolean hasGerritPushRefSpec(List<RefSpec> pushRefSpecs, String gerritQueue)
-  {
-    for (RefSpec refSpec : pushRefSpecs)
+    public void perform(SetupTaskContext context, String checkoutBranch, String remoteName, String removeURI)
+        throws Exception
     {
-      if (refSpec.getDestination().equals(gerritQueue))
+      if (cachedGit == null)
       {
-        return true;
+        cachedGit = GitUtil.cloneRepository(context, workDir, checkoutBranch, remoteName, removeURI);
+        cachedRepository = cachedGit.getRepository();
+        GitUtil.configureRepository(context, cachedRepository, checkoutBranch, remoteName);
+      }
+
+      if (!hasCheckout)
+      {
+        GitUtil.createBranch(context, cachedGit, checkoutBranch);
+        GitUtil.checkout(context, cachedGit, checkoutBranch);
+        GitUtil.resetHard(context, cachedGit);
       }
     }
 
-    return false;
-  }
+    public void dispose()
+    {
+      if (cachedRepository != null)
+      {
+        cachedRepository.close();
+      }
+    }
 
-  private void createBranch(SetupTaskContext context, Git git, String checkoutBranch) throws Exception
-  {
-    context.log("Creating local branch " + checkoutBranch);
+    private static File getWorkDir(SetupTaskContext context, String name)
+    {
+      File gitDir = new File(context.getBranchDir(), "git");
+      return new File(gitDir, name);
+    }
 
-    CreateBranchCommand command = git.branchCreate();
-    command.setUpstreamMode(SetupUpstreamMode.SET_UPSTREAM);
-    command.setName(checkoutBranch);
-    command.setStartPoint("refs/remotes/origin/" + checkoutBranch);
-    command.call();
-  }
+    private static boolean hasWorkTree(Git git) throws Exception
+    {
+      try
+      {
+        StatusCommand statusCommand = git.status();
+        statusCommand.call();
+        return true;
+      }
+      catch (NoWorkTreeException ex)
+      {
+        return false;
+      }
+    }
 
-  private void checkout(SetupTaskContext context, Git git, String checkoutBranch) throws Exception
-  {
-    context.log("Checking out local branch " + checkoutBranch);
+    private static Git cloneRepository(SetupTaskContext context, File workDir, String checkoutBranch,
+        String remoteName, String remoteURI) throws Exception
+    {
+      URI baseURI = URI.createURI(remoteURI);
+      String remote = URI.createHierarchicalURI(baseURI.scheme(),
+          context.getSetup().getPreferences().getUserName() + "@" + baseURI.authority(), baseURI.device(),
+          baseURI.segments(), baseURI.query(), baseURI.fragment()).toString();
+
+      context.log("Cloning Git repo " + remote + " to " + workDir);
+
+      CloneCommand command = Git.cloneRepository();
+      command.setNoCheckout(true);
+      command.setURI(remote);
+      command.setRemote(remoteName);
+      command.setBranchesToClone(Collections.singleton(checkoutBranch));
+      command.setDirectory(workDir);
+      command.setTimeout(10);
+      command.setProgressMonitor(new ProgressLogWrapper(context));
+      return command.call();
+    }
 
-    CheckoutCommand command = git.checkout();
-    command.setName(checkoutBranch);
-    command.call();
-  }
+    private static void configureRepository(SetupTaskContext context, Repository repository, String checkoutBranch,
+        String remoteName) throws Exception, IOException
+    {
+      StoredConfig config = repository.getConfig();
 
-  private void resetHard(SetupTaskContext context, Git git) throws Exception
-  {
-    context.log("Resetting hard");
+      boolean changed = false;
+      changed |= configureLineEndingConversion(context, config);
+      changed |= addPushRefSpec(context, config, checkoutBranch, remoteName);
+      if (changed)
+      {
+        config.save();
+      }
+    }
 
-    ResetCommand command = git.reset();
-    command.setMode(ResetType.HARD);
-    command.call();
-  }
+    private static boolean configureLineEndingConversion(SetupTaskContext context, StoredConfig config)
+        throws Exception
+    {
+      if (context.getOS().isLineEndingConversionNeeded())
+      {
+        context.log("Setting " + ConfigConstants.CONFIG_KEY_AUTOCRLF + " = true");
+        config.setEnum(ConfigConstants.CONFIG_CORE_SECTION, null, ConfigConstants.CONFIG_KEY_AUTOCRLF, AutoCRLF.TRUE);
+        return true;
+      }
 
-  /**
-   * @author Eike Stepper
-   */
-  private static final class ProgressLogWrapper implements ProgressMonitor
-  {
-    private SetupTaskContext context;
+      return false;
+    }
 
-    public ProgressLogWrapper(SetupTaskContext context)
+    private static boolean addPushRefSpec(SetupTaskContext context, StoredConfig config, String checkoutBranch,
+        String remoteName) throws Exception
     {
-      this.context = context;
+      String gerritQueue = "refs/for/" + checkoutBranch;
+      for (RemoteConfig remoteConfig : RemoteConfig.getAllRemoteConfigs(config))
+      {
+        if (remoteName.equals(remoteConfig.getName()))
+        {
+          List<RefSpec> pushRefSpecs = remoteConfig.getPushRefSpecs();
+          if (hasGerritPushRefSpec(pushRefSpecs, gerritQueue))
+          {
+            return false;
+          }
+
+          RefSpec refSpec = new RefSpec("HEAD:" + gerritQueue);
+          context.log("Adding push ref spec: " + refSpec);
+
+          remoteConfig.addPushRefSpec(refSpec);
+          remoteConfig.update(config);
+          return true;
+        }
+      }
+
+      return false;
     }
 
-    public void update(int completed)
+    private static boolean hasGerritPushRefSpec(List<RefSpec> pushRefSpecs, String gerritQueue)
     {
+      for (RefSpec refSpec : pushRefSpecs)
+      {
+        if (refSpec.getDestination().equals(gerritQueue))
+        {
+          return true;
+        }
+      }
+
+      return false;
     }
 
-    public void start(int totalTasks)
+    private static void createBranch(SetupTaskContext context, Git git, String checkoutBranch) throws Exception
     {
+      context.log("Creating local branch " + checkoutBranch);
+
+      CreateBranchCommand command = git.branchCreate();
+      command.setUpstreamMode(SetupUpstreamMode.SET_UPSTREAM);
+      command.setName(checkoutBranch);
+      command.setStartPoint("refs/remotes/origin/" + checkoutBranch);
+      command.call();
     }
 
-    public boolean isCancelled()
+    private static void checkout(SetupTaskContext context, Git git, String checkoutBranch) throws Exception
     {
-      return context.isCancelled();
+      context.log("Checking out local branch " + checkoutBranch);
+
+      CheckoutCommand command = git.checkout();
+      command.setName(checkoutBranch);
+      command.call();
     }
 
-    public void endTask()
+    private static void resetHard(SetupTaskContext context, Git git) throws Exception
     {
+      context.log("Resetting hard");
+
+      ResetCommand command = git.reset();
+      command.setMode(ResetType.HARD);
+      command.call();
     }
 
-    public void beginTask(String title, int totalWork)
+    /**
+     * @author Eike Stepper
+     */
+    private static final class ProgressLogWrapper implements ProgressMonitor
     {
-      context.log(title);
+      private SetupTaskContext context;
+
+      public ProgressLogWrapper(SetupTaskContext context)
+      {
+        this.context = context;
+      }
+
+      public void update(int completed)
+      {
+      }
+
+      public void start(int totalTasks)
+      {
+      }
+
+      public boolean isCancelled()
+      {
+        return context.isCancelled();
+      }
+
+      public void endTask()
+      {
+      }
+
+      public void beginTask(String title, int totalWork)
+      {
+        context.log(title);
+      }
     }
   }