Bug 367924 - PDE Build depends on org.eclipse.update* pluginsS4_8_0_M3aS4_8_0_M3S4_8_0_M2I20171113-2000I20171112-2000I20171111-1500I20171111-0410I20171111-0155I20171110-2000I20171109-2000I20171108-2000I20171107-2000I20171106-2000I20171106-0630I20171105-2000I20171104-2025I20171104-1500I20171103-2000I20171103-1105I20171103-0715I20171103-0405I20171102-2000I20171101-2000I20171031-2000I20171030-2000I20171030-0400I20171029-2000I20171028-1500I20171027-2340I20171027-2000I20171025-2000I20171025-0800I20171024-2000I20171024-0800I20171023-2000I20171023-0800I20171022-2000I20171022-0800I20171021-1500I20171020-2000I20171019-2000I20171018-2000I20171017-2000I20171017-0515I20171016-2000I20171015-2000I20171015-0655I20171014-1500I20171013-2000I20171012-2000I20171011-2000I20171011-0305I20171010-2000I20171009-2000I20171008-2000I20171007-1500I20171006-2000I20171005-2000I20171004-2000I20171004-0315I20171003-2000I20171002-2000I20171001-2000I20170930-1500I20170929-2000I20170928-2000I20170927-2000I20170927-0420I20170926-2000I20170925-2000I20170924-2000I20170923-1500I20170922-2000I20170921-2000I20170920-2000I20170920-0100I20170919-2000I20170918-2000I20170917-2000I20170916-1500I20170915-2000I20170915-1030I20170913-2000I20170913-1120I20170913-0800I20170913-0420I20170913-0220I20170912-2255I20170912-2000I20170912-0800I20170911-2000I20170911-0800I20170911-0405I20170910-2000I20170910-1055I20170910-0800I20170909-1500I20170909-0920I20170909-0800I20170909-0510I20170908-2345I20170908-2000I20170908-0035I20170907-2000I20170906-2000I20170906-0815I20170906-0225I20170905-2000I20170905-0600I20170905-0310I20170904-2000I20170904-0230I20170903-2000I20170902-1500I20170901-2000I20170831-2000I20170830-2000I20170830-0605I20170829-2345I20170829-2000I20170829-0940I20170829-0705I20170828-2000I20170828-1220I20170828-0730I20170827-2000I20170826-1500I20170825-2000I20170824-2000I20170823-2000I20170822-2000I20170821-2000I20170820-2000I20170819-1500I20170818-2000I20170818-0100I20170818-0040I20170817-2140I20170817-2000I20170816-2000I20170815-2000

Used patch from Daniel Krzysztof to create this Gerrit. 

Change-Id: I3cb5bf0821e7dd6da4e0151cdf56c7dd630de141
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>

2 files changed, 1 insertions, 63 deletions

diff --git a/org.eclipse.pde.build/META-INF/MANIFEST.MF b/org.eclipse.pde.build/META-INF/MANIFEST.MF
index 620e9ba7..1cc6debb 100644
--- a/org.eclipse.pde.build/META-INF/MANIFEST.MF
+++ b/org.eclipse.pde.build/META-INF/MANIFEST.MF
@@ -19,7 +19,6 @@ Export-Package: org.eclipse.pde.build,
  org.eclipse.pde.internal.build.site.compatibility;x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.ant.core;bundle-version="[3.1.100,4.0.0)",
- org.eclipse.update.configurator;bundle-version="[3.1.0,4.0.0)",
  org.eclipse.osgi;bundle-version="[3.3.0,4.0.0)",
  org.eclipse.equinox.p2.jarprocessor;bundle-version="[1.0.1,2.0.0)",
  org.eclipse.equinox.p2.publisher;bundle-version="1.1.0",
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/PluginPathFinder.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/PluginPathFinder.java
index 2f766c22..95972e57 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/PluginPathFinder.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/PluginPathFinder.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2013 IBM Corporation and others.
+ * Copyright (c) 2004, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -11,19 +11,14 @@
 package org.eclipse.pde.internal.build.site;
 
 import java.io.*;
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.*;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.pde.internal.build.IPDEBuildConstants;
 import org.eclipse.pde.internal.build.Utils;
-import org.eclipse.update.configurator.ConfiguratorUtils;
-import org.eclipse.update.configurator.IPlatformConfiguration;
 
 public class PluginPathFinder {
-	private static final String URL_PROPERTY = "org.eclipse.update.resolution_url"; //$NON-NLS-1$
-	private static final String EMPTY_STRING = ""; //$NON-NLS-1$
 	private static final String DROPINS = "dropins"; //$NON-NLS-1$
 	private static final String LINK = ".link"; //$NON-NLS-1$
 	private static final String ECLIPSE = "eclipse"; //$NON-NLS-1$
@@ -158,67 +153,11 @@ public class PluginPathFinder {
 			}
 		}
 
-		File file = new File(platformHome, "configuration/org.eclipse.update/platform.xml"); //$NON-NLS-1$
-		if (file.exists()) {
-			try {
-				String value = new Path(platformHome).toFile().toURL().toExternalForm();
-				System.setProperty(URL_PROPERTY, value);
-				try {
-					IPlatformConfiguration config = ConfiguratorUtils.getPlatformConfiguration(file.toURL());
-					return getConfiguredSitesPaths(platformHome, config, features);
-				} finally {
-					System.setProperty(URL_PROPERTY, EMPTY_STRING);
-				}
-			} catch (MalformedURLException e) {
-				//ignore
-			} catch (IOException e) {
-				//ignore
-			}
-		}
-
 		List<File> list = scanLocations(getSites(platformHome, features));
 		list.addAll(getDropins(platformHome, features));
 		return Utils.asFile(list);
 	}
 
-	private static File[] getConfiguredSitesPaths(String platformHome, IPlatformConfiguration configuration, boolean features) {
-		List<File> installPlugins = scanLocations(new File[] {new File(platformHome, features ? IPDEBuildConstants.DEFAULT_FEATURE_LOCATION : IPDEBuildConstants.DEFAULT_PLUGIN_LOCATION)});
-		List<File> extensionPlugins = getExtensionPlugins(configuration, features);
-		List<File> dropinsPlugins = getDropins(platformHome, features);
-
-		Set<File> all = new LinkedHashSet<File>();
-		all.addAll(installPlugins);
-		all.addAll(extensionPlugins);
-		all.addAll(dropinsPlugins);
-
-		return all.toArray(new File[all.size()]);
-	}
-
-	/**
-	 * 
-	 * @param config
-	 * @param features true for features false for plugins
-	 * @return List of Files for features or plugins on the site
-	 */
-	private static List<File> getExtensionPlugins(IPlatformConfiguration config, boolean features) {
-		ArrayList<File> extensionPlugins = new ArrayList<File>();
-		IPlatformConfiguration.ISiteEntry[] sites = config.getConfiguredSites();
-		for (int i = 0; i < sites.length; i++) {
-			URL url = sites[i].getURL();
-			if ("file".equalsIgnoreCase(url.getProtocol())) { //$NON-NLS-1$
-				String[] entries;
-				if (features)
-					entries = sites[i].getFeatures();
-				else
-					entries = sites[i].getPlugins();
-				for (int j = 0; j < entries.length; j++) {
-					extensionPlugins.add(new File(url.getFile(), entries[j]));
-				}
-			}
-		}
-		return extensionPlugins;
-	}
-
 	/**
 	 * Scan given plugin/feature directories or jars for existence
 	 * @param sites