*** empty log message ***
diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/TargetPlatform.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/TargetPlatform.java
index 2e8d2f7..b3ac5a8 100644
--- a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/TargetPlatform.java
+++ b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/TargetPlatform.java
@@ -218,14 +218,11 @@
bWriter.newLine();
if (autoStartPlugins.size() > 0) {
- StringBuffer buffer = new StringBuffer();
- // skip org.eclipse.osgi (first one)
- for (int i = 1; i < autoStartPlugins.size(); i++) {
- buffer.append(getOSGiLocation(autoStartPlugins.get(i).toString(), pluginMap));
- buffer.append("@" + i);
- if (i < autoStartPlugins.size() - 1)
- buffer.append(",");
- }
+ StringBuffer buffer = new StringBuffer();
+ buffer.append(getOSGiLocation("org.eclipse.osgi.services", pluginMap) + ",");
+ buffer.append(getOSGiLocation("org.eclipse.osgi.util", pluginMap) + ",");
+ buffer.append(getOSGiLocation("org.eclipse.core.runtime", pluginMap) + "@2,");
+ buffer.append(getOSGiLocation("org.eclipse.update.configurator", pluginMap) + "@3");
bWriter.write("osgi.bundles=" + buffer.toString());
bWriter.newLine();
}
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/LauncherUtils.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/LauncherUtils.java
index 50ac663..30c1157 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/LauncherUtils.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/launcher/LauncherUtils.java
@@ -244,21 +244,21 @@
if (!PDECore.getDefault().getModelManager().isOSGiRuntime()) {
list.add("org.eclipse.core.boot");
} else {
- try {
+ //try {
list.add("org.eclipse.osgi");
- if (config.getAttribute(ILauncherSettings.CONFIG_USE_DEFAULT, true)) {
+ //if (config.getAttribute(ILauncherSettings.CONFIG_USE_DEFAULT, true)) {
list.add("org.eclipse.osgi.services");
list.add("org.eclipse.osgi.util");
list.add("org.eclipse.core.runtime");
list.add("org.eclipse.update.configurator");
- } else {
+ /*} else {
String selected = config.getAttribute(ILauncherSettings.CONFIG_AUTO_START, "");
StringTokenizer tokenizer = new StringTokenizer(selected, ",");
while (tokenizer.hasMoreTokens())
list.add(tokenizer.nextToken());
}
} catch (CoreException e) {
- }
+ }*/
}
return list;
}
