Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Kaegi2008-06-04 03:34:13 +0000
committerSimon Kaegi2008-06-04 03:34:13 +0000
commitd1279d5bfad390ef1d352a1d0c1bf9731844ee01 (patch)
tree87f8a29a9490d59f7dab3f04970a642d9e1dae29
parent591f4d8db35e71d15126cbeb52756a002d3d3040 (diff)
downloadrt.equinox.p2-d1279d5bfad390ef1d352a1d0c1bf9731844ee01.tar.gz
rt.equinox.p2-d1279d5bfad390ef1d352a1d0c1bf9731844ee01.tar.xz
rt.equinox.p2-d1279d5bfad390ef1d352a1d0c1bf9731844ee01.zip
Bug 234882 Director fails to acquire framework manipulator
-rw-r--r--bundles/org.eclipse.equinox.p2.director.app/src/org/eclipse/equinox/internal/p2/director/app/Application.java11
1 files changed, 11 insertions, 0 deletions
diff --git a/bundles/org.eclipse.equinox.p2.director.app/src/org/eclipse/equinox/internal/p2/director/app/Application.java b/bundles/org.eclipse.equinox.p2.director.app/src/org/eclipse/equinox/internal/p2/director/app/Application.java
index c16db1fef..f261e36b8 100644
--- a/bundles/org.eclipse.equinox.p2.director.app/src/org/eclipse/equinox/internal/p2/director/app/Application.java
+++ b/bundles/org.eclipse.equinox.p2.director.app/src/org/eclipse/equinox/internal/p2/director/app/Application.java
@@ -35,6 +35,8 @@ public class Application implements IApplication {
private static final Integer EXIT_ERROR = new Integer(13);
static private String FLAVOR_DEFAULT = "tooling"; //$NON-NLS-1$
static private String EXEMPLARY_SETUP = "org.eclipse.equinox.p2.exemplarysetup"; //$NON-NLS-1$
+ static private String FRAMEWORKADMIN_EQUINOX = "org.eclipse.equinox.frameworkadmin.equinox"; //$NON-NLS-1$
+ static private String SIMPLE_CONFIGURATOR_MANIPULATOR = "org.eclipse.equinox.simpleconfigurator.manipulator"; //$NON-NLS-1$
public static final int COMMAND_INSTALL = 0;
public static final int COMMAND_UNINSTALL = 1;
@@ -409,6 +411,15 @@ public class Application implements IApplication {
LogHelper.log(new Status(IStatus.ERROR, Activator.ID, NLS.bind(Messages.Missing_bundle, EXEMPLARY_SETUP)));
return EXIT_ERROR;
}
+ if (!startEarly(SIMPLE_CONFIGURATOR_MANIPULATOR)) {
+ LogHelper.log(new Status(IStatus.ERROR, Activator.ID, NLS.bind(Messages.Missing_bundle, SIMPLE_CONFIGURATOR_MANIPULATOR)));
+ return EXIT_ERROR;
+ }
+ if (!startEarly(FRAMEWORKADMIN_EQUINOX)) {
+ LogHelper.log(new Status(IStatus.ERROR, Activator.ID, NLS.bind(Messages.Missing_bundle, FRAMEWORKADMIN_EQUINOX)));
+ return EXIT_ERROR;
+ }
+
return run((String[]) context.getArguments().get("application.args")); //$NON-NLS-1$
}

Back to the top