patch from Pascal: remove generation of manifests
diff --git a/update/org.eclipse.update.configurator/src/org/eclipse/update/configurator/ConfigurationActivator.java b/update/org.eclipse.update.configurator/src/org/eclipse/update/configurator/ConfigurationActivator.java
index 96f329f..5ecc2e7 100644
--- a/update/org.eclipse.update.configurator/src/org/eclipse/update/configurator/ConfigurationActivator.java
+++ b/update/org.eclipse.update.configurator/src/org/eclipse/update/configurator/ConfigurationActivator.java
@@ -31,13 +31,11 @@
private static BundleContext context;
private ServiceTracker platformTracker;
- private ServiceTracker converterTracker;
private ServiceRegistration configurationFactorySR;
private String[] allArgs;
// location used to put the generated manfests
private String cacheLocation = (String) System.getProperties().get("osgi.manifest.cache");
- private IPluginConverter converter;
private Set ignore;
private BundleListener reconcilerListener;
private IPlatform platform;
@@ -67,7 +65,6 @@
if (DEBUG)
System.out.println("Starting update configurator...");
computeIgnoredBundles();
- converter = acquireConverter();
installBundles();
}
@@ -134,8 +131,6 @@
platform = null;
releasePlatform();
- converter = null;
- releaseConverter();
writePlatformConfigurationTimeStamp();
configurationFactorySR.unregister();
}
@@ -160,13 +155,6 @@
platformTracker = null;
}
- private void releaseConverter() {
- if (converterTracker == null)
- return;
- converterTracker.close();
- converterTracker = null;
- }
-
private IPlatform acquirePlatform() {
if (platformTracker == null) {
platformTracker = new ServiceTracker(context, IPlatform.class.getName(), null);
@@ -183,21 +171,6 @@
return result;
}
- private IPluginConverter acquireConverter() {
- if (converterTracker == null) {
- converterTracker = new ServiceTracker(context, IPluginConverter.class.getName(), null);
- converterTracker.open();
- }
- IPluginConverter result = (IPluginConverter) converterTracker.getService();
- while (result == null) {
- try {
- platformTracker.waitForService(1000);
- result = (IPluginConverter) converterTracker.getService();
- } catch (InterruptedException ie) {
- }
- }
- return result;
- }
private void installBundles() {
URL installURL = platform.getInstallURL();
ServiceReference reference = context.getServiceReference(StartLevel.class.getName());
