Add setup tool

9 files changed, 15 insertions, 195 deletions

diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/PreferencesItemProvider.java b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/PreferencesItemProvider.java
index b15f09b8be..729cc60242 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/PreferencesItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.edit/src/org/eclipse/emf/cdo/releng/setup/provider/PreferencesItemProvider.java
@@ -62,7 +62,6 @@ public class PreferencesItemProvider extends ToolInstallationItemProvider implem
       super.getPropertyDescriptors(object);
 
       addUserNamePropertyDescriptor(object);
-      addBundlePoolPropertyDescriptor(object);
       addInstallFolderPropertyDescriptor(object);
       addGitPrefixPropertyDescriptor(object);
     }
@@ -86,22 +85,6 @@ public class PreferencesItemProvider extends ToolInstallationItemProvider implem
   }
 
   /**
-   * This adds a property descriptor for the Bundle Pool feature.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected void addBundlePoolPropertyDescriptor(Object object)
-  {
-    itemPropertyDescriptors.add(createItemPropertyDescriptor(
-        ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-        getString("_UI_Preferences_bundlePool_feature"),
-        getString("_UI_PropertyDescriptor_description", "_UI_Preferences_bundlePool_feature", "_UI_Preferences_type"),
-        SetupPackage.Literals.PREFERENCES__BUNDLE_POOL, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-        null, null));
-  }
-
-  /**
    * This adds a property descriptor for the Install Folder feature.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
@@ -209,7 +192,6 @@ public class PreferencesItemProvider extends ToolInstallationItemProvider implem
     switch (notification.getFeatureID(Preferences.class))
     {
     case SetupPackage.PREFERENCES__USER_NAME:
-    case SetupPackage.PREFERENCES__BUNDLE_POOL:
     case SetupPackage.PREFERENCES__INSTALL_FOLDER:
     case SetupPackage.PREFERENCES__GIT_PREFIX:
       fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.ide/src/org/eclipse/emf/cdo/releng/setup/ide/Buckminster.java b/plugins/org.eclipse.emf.cdo.releng.setup.ide/src/org/eclipse/emf/cdo/releng/setup/ide/Buckminster.java
index 36a49c0d1f..abb599e169 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.ide/src/org/eclipse/emf/cdo/releng/setup/ide/Buckminster.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.ide/src/org/eclipse/emf/cdo/releng/setup/ide/Buckminster.java
@@ -192,9 +192,10 @@ public final class Buckminster
       Files.rename(tp, tpOld);
     }
 
-    String bundlePool = CONTEXT.getSetup().getPreferences().getBundlePool();
-    FileLock lock = bundlePool != null && bundlePool.length() != 0 ? FileLock.forWrite(new File(bundlePool)) : null;
+    File bundlePool = new File(CONTEXT.getSetup().getPreferences().getInstallFolder(), ".p2pool-tp");
+    bundlePool.mkdirs();
 
+    FileLock lock = FileLock.forWrite(bundlePool);
     boolean autoBuilding = disableAutoBuilding();
 
     try
@@ -213,7 +214,7 @@ public final class Buckminster
 
       if (lock != null)
       {
-        updateBundlePool(bundlePool);
+        updateBundlePool(bundlePool.getAbsolutePath());
       }
 
       if (Progress.log().isCancelled())
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup.product/src/org/eclipse/emf/cdo/releng/setup/product/SetupDialog.java b/plugins/org.eclipse.emf.cdo.releng.setup.product/src/org/eclipse/emf/cdo/releng/setup/product/SetupDialog.java
index b6e7803fdb..83a358668d 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup.product/src/org/eclipse/emf/cdo/releng/setup/product/SetupDialog.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup.product/src/org/eclipse/emf/cdo/releng/setup/product/SetupDialog.java
@@ -124,8 +124,6 @@ public class SetupDialog extends TitleAreaDialog
 
   private Text userNameText;
 
-  private Text bundlePoolText;
-
   private Text installFolderText;
 
   private Text gitPrefixText;
@@ -347,35 +345,6 @@ public class SetupDialog extends TitleAreaDialog
     Label empty = new Label(grpPreferences, SWT.NONE);
     empty.setBounds(0, 0, 55, 15);
 
-    Label bundlePoolLabel = new Label(grpPreferences, SWT.NONE);
-    bundlePoolLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
-    bundlePoolLabel.setBounds(0, 0, 55, 15);
-    bundlePoolLabel.setText("Bundle Pool:");
-
-    bundlePoolText = new Text(grpPreferences, SWT.BORDER);
-    bundlePoolText.setToolTipText("Points to your local bundle pool to speed up p2 installations.");
-    bundlePoolText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
-
-    Button bundlePoolButton = new Button(grpPreferences, SWT.NONE);
-    bundlePoolButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
-    bundlePoolButton.setBounds(0, 0, 75, 25);
-    bundlePoolButton.setText("Browse...");
-    bundlePoolButton.addSelectionListener(new SelectionAdapter()
-    {
-      @Override
-      public void widgetSelected(SelectionEvent e)
-      {
-        DirectoryDialog dlg = new DirectoryDialog(getShell());
-        dlg.setText("Select Bundle Pool Folder");
-        dlg.setMessage("Select a folder");
-        String dir = dlg.open();
-        if (dir != null)
-        {
-          bundlePoolText.setText(dir);
-        }
-      }
-    });
-
     Label installFolderLabel = new Label(grpPreferences, SWT.NONE);
     installFolderLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
     installFolderLabel.setBounds(0, 0, 55, 15);
@@ -494,7 +463,6 @@ public class SetupDialog extends TitleAreaDialog
       preferences = (Preferences)resource.getContents().get(0);
 
       userNameText.setText(safe(preferences.getUserName()));
-      bundlePoolText.setText(safe(preferences.getBundlePool()));
       installFolderText.setText(safe(preferences.getInstallFolder()));
       gitPrefixText.setText(safe(preferences.getGitPrefix()));
     }
@@ -507,7 +475,6 @@ public class SetupDialog extends TitleAreaDialog
       File rootFolder = new File(System.getProperty("user.home", "."));
 
       userNameText.setText(safe(System.getProperty("user.name", "<username>")).toLowerCase());
-      bundlePoolText.setText(safe(getAbsolutePath(new File(rootFolder, "p2pool"))));
       installFolderText.setText(safe(getAbsolutePath(rootFolder)));
       gitPrefixText.setText(safe(getAbsolutePath(new File(OS.INSTANCE.getGitPrefix()))));
     }
@@ -672,7 +639,6 @@ public class SetupDialog extends TitleAreaDialog
   {
     final Object[] checkedElements = viewer.getCheckedElements();
     final String installFolder = installFolderText.getText();
-    final String bundlePool = bundlePoolText.getText();
     final String gitPrefix = safe(gitPrefixText.getText());
 
     File folder = new File(installFolder);
@@ -693,7 +659,7 @@ public class SetupDialog extends TitleAreaDialog
             {
               try
               {
-                install(setup, installFolder, bundlePool, gitPrefix);
+                install(setup, installFolder, gitPrefix);
               }
               catch (IOException ex)
               {
@@ -708,7 +674,7 @@ public class SetupDialog extends TitleAreaDialog
     });
   }
 
-  private void install(Setup setup, String installFolder, String bundlePool, String gitPrefix) throws Exception
+  private void install(Setup setup, String installFolder, String gitPrefix) throws Exception
   {
     Branch branch = setup.getBranch();
     Progress.log().addLine("Setting up " + branch.getProject().getName() + " " + branch.getName());
@@ -721,6 +687,8 @@ public class SetupDialog extends TitleAreaDialog
     updateLocations.add(BUCKY_URI);
     updateLocations.add(RELENG_URI);
 
+    String bundlePool = new File(installFolder, ".p2pool-ide").getAbsolutePath();
+
     install(bundlePool, destination, updateLocations, setup.getEclipseVersion().getDirectorCall());
 
     Director.from(bundlePool) //
@@ -907,7 +875,6 @@ public class SetupDialog extends TitleAreaDialog
   private void savePreferences()
   {
     preferences.setUserName(userNameText.getText());
-    preferences.setBundlePool(bundlePoolText.getText());
     preferences.setInstallFolder(installFolderText.getText());
     preferences.setGitPrefix(gitPrefixText.getText());
 
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/model/setup.ecore b/plugins/org.eclipse.emf.cdo.releng.setup/model/setup.ecore
index d506d6a766..45d8fd2bb7 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup/model/setup.ecore
+++ b/plugins/org.eclipse.emf.cdo.releng.setup/model/setup.ecore
@@ -3,7 +3,6 @@
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="setup" nsURI="http://www.eclipse.org/CDO/releng/setup/1.0" nsPrefix="setup">
   <eClassifiers xsi:type="ecore:EClass" name="Preferences" eSuperTypes="#//ToolInstallation">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="userName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bundlePool" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="installFolder" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="gitPrefix" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="linkLocations" upperBound="-1"
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/model/setup.ecorediag b/plugins/org.eclipse.emf.cdo.releng.setup/model/setup.ecorediag
index ea4966c655..59b78a722a 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup/model/setup.ecorediag
+++ b/plugins/org.eclipse.emf.cdo.releng.setup/model/setup.ecorediag
@@ -215,10 +215,6 @@
         <element xmi:type="ecore:EAttribute" href="setup.ecore#//Preferences/userName"/>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_eISl0eoYEeKpRf481yfX-g"/>
       </children>
-      <children xmi:type="notation:Node" xmi:id="_fqKBMOoYEeKpRf481yfX-g" type="2001">
-        <element xmi:type="ecore:EAttribute" href="setup.ecore#//Preferences/bundlePool"/>
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_fqKoQOoYEeKpRf481yfX-g"/>
-      </children>
       <children xmi:type="notation:Node" xmi:id="_cVkD8OoYEeKpRf481yfX-g" type="2001">
         <element xmi:type="ecore:EAttribute" href="setup.ecore#//Preferences/installFolder"/>
         <layoutConstraint xmi:type="notation:Location" xmi:id="_cVkD8eoYEeKpRf481yfX-g"/>
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/Preferences.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/Preferences.java
index 70dbf11647..be482948d7 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/Preferences.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/Preferences.java
@@ -24,7 +24,6 @@ import org.eclipse.emf.common.util.EList;
  * The following features are supported:
  * <ul>
  *   <li>{@link org.eclipse.emf.cdo.releng.setup.Preferences#getUserName <em>User Name</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.releng.setup.Preferences#getBundlePool <em>Bundle Pool</em>}</li>
  *   <li>{@link org.eclipse.emf.cdo.releng.setup.Preferences#getInstallFolder <em>Install Folder</em>}</li>
  *   <li>{@link org.eclipse.emf.cdo.releng.setup.Preferences#getGitPrefix <em>Git Prefix</em>}</li>
  *   <li>{@link org.eclipse.emf.cdo.releng.setup.Preferences#getLinkLocations <em>Link Locations</em>}</li>
@@ -69,32 +68,6 @@ public interface Preferences extends ToolInstallation
   void setUserName(String value);
 
   /**
-   * Returns the value of the '<em><b>Bundle Pool</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Bundle Pool</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Bundle Pool</em>' attribute.
-   * @see #setBundlePool(String)
-   * @see org.eclipse.emf.cdo.releng.setup.SetupPackage#getPreferences_BundlePool()
-   * @model
-   * @generated
-   */
-  String getBundlePool();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.releng.setup.Preferences#getBundlePool <em>Bundle Pool</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Bundle Pool</em>' attribute.
-   * @see #getBundlePool()
-   * @generated
-   */
-  void setBundlePool(String value);
-
-  /**
    * Returns the value of the '<em><b>Install Folder</b></em>' attribute.
    * <!-- begin-user-doc -->
    * <p>
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/SetupPackage.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/SetupPackage.java
index 0f95d556bd..ca771d431b 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/SetupPackage.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/SetupPackage.java
@@ -231,22 +231,13 @@ public interface SetupPackage extends EPackage
   int PREFERENCES__USER_NAME = TOOL_INSTALLATION_FEATURE_COUNT + 0;
 
   /**
-   * The feature id for the '<em><b>Bundle Pool</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PREFERENCES__BUNDLE_POOL = TOOL_INSTALLATION_FEATURE_COUNT + 1;
-
-  /**
    * The feature id for the '<em><b>Install Folder</b></em>' attribute.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int PREFERENCES__INSTALL_FOLDER = TOOL_INSTALLATION_FEATURE_COUNT + 2;
+  int PREFERENCES__INSTALL_FOLDER = TOOL_INSTALLATION_FEATURE_COUNT + 1;
 
   /**
    * The feature id for the '<em><b>Git Prefix</b></em>' attribute.
@@ -255,7 +246,7 @@ public interface SetupPackage extends EPackage
    * @generated
    * @ordered
    */
-  int PREFERENCES__GIT_PREFIX = TOOL_INSTALLATION_FEATURE_COUNT + 3;
+  int PREFERENCES__GIT_PREFIX = TOOL_INSTALLATION_FEATURE_COUNT + 2;
 
   /**
    * The feature id for the '<em><b>Link Locations</b></em>' containment reference list.
@@ -264,7 +255,7 @@ public interface SetupPackage extends EPackage
    * @generated
    * @ordered
    */
-  int PREFERENCES__LINK_LOCATIONS = TOOL_INSTALLATION_FEATURE_COUNT + 4;
+  int PREFERENCES__LINK_LOCATIONS = TOOL_INSTALLATION_FEATURE_COUNT + 3;
 
   /**
    * The number of structural features of the '<em>Preferences</em>' class.
@@ -273,7 +264,7 @@ public interface SetupPackage extends EPackage
    * @generated
    * @ordered
    */
-  int PREFERENCES_FEATURE_COUNT = TOOL_INSTALLATION_FEATURE_COUNT + 5;
+  int PREFERENCES_FEATURE_COUNT = TOOL_INSTALLATION_FEATURE_COUNT + 4;
 
   /**
    * The meta object id for the '{@link org.eclipse.emf.cdo.releng.setup.impl.SetupImpl <em>Setup</em>}' class.
@@ -1353,17 +1344,6 @@ public interface SetupPackage extends EPackage
   EAttribute getPreferences_UserName();
 
   /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.releng.setup.Preferences#getBundlePool <em>Bundle Pool</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Bundle Pool</em>'.
-   * @see org.eclipse.emf.cdo.releng.setup.Preferences#getBundlePool()
-   * @see #getPreferences()
-   * @generated
-   */
-  EAttribute getPreferences_BundlePool();
-
-  /**
    * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.releng.setup.Preferences#getInstallFolder <em>Install Folder</em>}'.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
@@ -1884,14 +1864,6 @@ public interface SetupPackage extends EPackage
     EAttribute PREFERENCES__USER_NAME = eINSTANCE.getPreferences_UserName();
 
     /**
-     * The meta object literal for the '<em><b>Bundle Pool</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute PREFERENCES__BUNDLE_POOL = eINSTANCE.getPreferences_BundlePool();
-
-    /**
      * The meta object literal for the '<em><b>Install Folder</b></em>' attribute feature.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/PreferencesImpl.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/PreferencesImpl.java
index 39c8830f36..f54be8534e 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/PreferencesImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/PreferencesImpl.java
@@ -31,7 +31,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * The following features are implemented:
  * <ul>
  *   <li>{@link org.eclipse.emf.cdo.releng.setup.impl.PreferencesImpl#getUserName <em>User Name</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.releng.setup.impl.PreferencesImpl#getBundlePool <em>Bundle Pool</em>}</li>
  *   <li>{@link org.eclipse.emf.cdo.releng.setup.impl.PreferencesImpl#getInstallFolder <em>Install Folder</em>}</li>
  *   <li>{@link org.eclipse.emf.cdo.releng.setup.impl.PreferencesImpl#getGitPrefix <em>Git Prefix</em>}</li>
  *   <li>{@link org.eclipse.emf.cdo.releng.setup.impl.PreferencesImpl#getLinkLocations <em>Link Locations</em>}</li>
@@ -63,26 +62,6 @@ public class PreferencesImpl extends ToolInstallationImpl implements Preferences
   protected String userName = USER_NAME_EDEFAULT;
 
   /**
-   * The default value of the '{@link #getBundlePool() <em>Bundle Pool</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getBundlePool()
-   * @generated
-   * @ordered
-   */
-  protected static final String BUNDLE_POOL_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getBundlePool() <em>Bundle Pool</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getBundlePool()
-   * @generated
-   * @ordered
-   */
-  protected String bundlePool = BUNDLE_POOL_EDEFAULT;
-
-  /**
    * The default value of the '{@link #getInstallFolder() <em>Install Folder</em>}' attribute.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
@@ -181,30 +160,6 @@ public class PreferencesImpl extends ToolInstallationImpl implements Preferences
    * <!-- end-user-doc -->
    * @generated
    */
-  public String getBundlePool()
-  {
-    return bundlePool;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setBundlePool(String newBundlePool)
-  {
-    String oldBundlePool = bundlePool;
-    bundlePool = newBundlePool;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SetupPackage.PREFERENCES__BUNDLE_POOL, oldBundlePool,
-          bundlePool));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
   public String getInstallFolder()
   {
     return installFolder;
@@ -291,8 +246,6 @@ public class PreferencesImpl extends ToolInstallationImpl implements Preferences
     {
     case SetupPackage.PREFERENCES__USER_NAME:
       return getUserName();
-    case SetupPackage.PREFERENCES__BUNDLE_POOL:
-      return getBundlePool();
     case SetupPackage.PREFERENCES__INSTALL_FOLDER:
       return getInstallFolder();
     case SetupPackage.PREFERENCES__GIT_PREFIX:
@@ -317,9 +270,6 @@ public class PreferencesImpl extends ToolInstallationImpl implements Preferences
     case SetupPackage.PREFERENCES__USER_NAME:
       setUserName((String)newValue);
       return;
-    case SetupPackage.PREFERENCES__BUNDLE_POOL:
-      setBundlePool((String)newValue);
-      return;
     case SetupPackage.PREFERENCES__INSTALL_FOLDER:
       setInstallFolder((String)newValue);
       return;
@@ -347,9 +297,6 @@ public class PreferencesImpl extends ToolInstallationImpl implements Preferences
     case SetupPackage.PREFERENCES__USER_NAME:
       setUserName(USER_NAME_EDEFAULT);
       return;
-    case SetupPackage.PREFERENCES__BUNDLE_POOL:
-      setBundlePool(BUNDLE_POOL_EDEFAULT);
-      return;
     case SetupPackage.PREFERENCES__INSTALL_FOLDER:
       setInstallFolder(INSTALL_FOLDER_EDEFAULT);
       return;
@@ -375,8 +322,6 @@ public class PreferencesImpl extends ToolInstallationImpl implements Preferences
     {
     case SetupPackage.PREFERENCES__USER_NAME:
       return USER_NAME_EDEFAULT == null ? userName != null : !USER_NAME_EDEFAULT.equals(userName);
-    case SetupPackage.PREFERENCES__BUNDLE_POOL:
-      return BUNDLE_POOL_EDEFAULT == null ? bundlePool != null : !BUNDLE_POOL_EDEFAULT.equals(bundlePool);
     case SetupPackage.PREFERENCES__INSTALL_FOLDER:
       return INSTALL_FOLDER_EDEFAULT == null ? installFolder != null : !INSTALL_FOLDER_EDEFAULT.equals(installFolder);
     case SetupPackage.PREFERENCES__GIT_PREFIX:
@@ -401,8 +346,6 @@ public class PreferencesImpl extends ToolInstallationImpl implements Preferences
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (userName: ");
     result.append(userName);
-    result.append(", bundlePool: ");
-    result.append(bundlePool);
     result.append(", installFolder: ");
     result.append(installFolder);
     result.append(", gitPrefix: ");
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/SetupPackageImpl.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/SetupPackageImpl.java
index 538decaa18..023c0a417b 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/SetupPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/SetupPackageImpl.java
@@ -746,19 +746,9 @@ public class SetupPackageImpl extends EPackageImpl implements SetupPackage
    * <!-- end-user-doc -->
    * @generated
    */
-  public EAttribute getPreferences_BundlePool()
-  {
-    return (EAttribute)preferencesEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
   public EAttribute getPreferences_InstallFolder()
   {
-    return (EAttribute)preferencesEClass.getEStructuralFeatures().get(2);
+    return (EAttribute)preferencesEClass.getEStructuralFeatures().get(1);
   }
 
   /**
@@ -768,7 +758,7 @@ public class SetupPackageImpl extends EPackageImpl implements SetupPackage
    */
   public EAttribute getPreferences_GitPrefix()
   {
-    return (EAttribute)preferencesEClass.getEStructuralFeatures().get(3);
+    return (EAttribute)preferencesEClass.getEStructuralFeatures().get(2);
   }
 
   /**
@@ -778,7 +768,7 @@ public class SetupPackageImpl extends EPackageImpl implements SetupPackage
    */
   public EReference getPreferences_LinkLocations()
   {
-    return (EReference)preferencesEClass.getEStructuralFeatures().get(4);
+    return (EReference)preferencesEClass.getEStructuralFeatures().get(3);
   }
 
   /**
@@ -824,7 +814,6 @@ public class SetupPackageImpl extends EPackageImpl implements SetupPackage
     // Create classes and their features
     preferencesEClass = createEClass(PREFERENCES);
     createEAttribute(preferencesEClass, PREFERENCES__USER_NAME);
-    createEAttribute(preferencesEClass, PREFERENCES__BUNDLE_POOL);
     createEAttribute(preferencesEClass, PREFERENCES__INSTALL_FOLDER);
     createEAttribute(preferencesEClass, PREFERENCES__GIT_PREFIX);
     createEReference(preferencesEClass, PREFERENCES__LINK_LOCATIONS);
@@ -936,8 +925,6 @@ public class SetupPackageImpl extends EPackageImpl implements SetupPackage
         IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getPreferences_UserName(), ecorePackage.getEString(), "userName", null, 0, 1, Preferences.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getPreferences_BundlePool(), ecorePackage.getEString(), "bundlePool", null, 0, 1, Preferences.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getPreferences_InstallFolder(), ecorePackage.getEString(), "installFolder", null, 0, 1,
         Preferences.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);