Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault2008-04-24 16:10:47 -0400
committerPascal Rapicault2008-04-24 16:10:47 -0400
commit8e8cc017f9a67e4a3a36876694180927df917a2f (patch)
tree0d17f85f3aee899acfe27fd55715c4e34fc21cf4 /bundles
parent4fbed3643eea00de46393a0a6ace3d83c503cf5e (diff)
downloadrt.equinox.p2-8e8cc017f9a67e4a3a36876694180927df917a2f.tar.gz
rt.equinox.p2-8e8cc017f9a67e4a3a36876694180927df917a2f.tar.xz
rt.equinox.p2-8e8cc017f9a67e4a3a36876694180927df917a2f.zip
Bug 228757 - Generator should ignore org.eclipse.equinox.launcher from the osgi.bundles list
Diffstat (limited to 'bundles')
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/EclipseInstallGeneratorInfoProvider.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/Generator.java3
2 files changed, 4 insertions, 1 deletions
diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/EclipseInstallGeneratorInfoProvider.java b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/EclipseInstallGeneratorInfoProvider.java
index c8739941c..b4ec0c27c 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/EclipseInstallGeneratorInfoProvider.java
+++ b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/EclipseInstallGeneratorInfoProvider.java
@@ -142,7 +142,7 @@ public class EclipseInstallGeneratorInfoProvider implements IGeneratorInfo {
throw new RuntimeException("Framework manipulator not found"); //$NON-NLS-1$
}
- private GeneratorBundleInfo createLauncher() {
+ public static GeneratorBundleInfo createLauncher() {
GeneratorBundleInfo result = new GeneratorBundleInfo();
result.setSymbolicName("org.eclipse.equinox.launcher"); //$NON-NLS-1$
result.setVersion("0.0.0"); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/Generator.java b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/Generator.java
index 8e9409d59..ce62b91b8 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/Generator.java
+++ b/bundles/org.eclipse.equinox.p2.metadata.generator/src/org/eclipse/equinox/internal/provisional/p2/metadata/generator/Generator.java
@@ -507,6 +507,9 @@ public class Generator {
if (bundle == null)
continue;
+ if (bundle.getSymbolicName().equals(ORG_ECLIPSE_EQUINOX_LAUNCHER)) {
+ bundle = EclipseInstallGeneratorInfoProvider.createLauncher();
+ }
if (bundle.getSymbolicName().equals(ORG_ECLIPSE_UPDATE_CONFIGURATOR)) {
bundle.setStartLevel(BundleInfo.NO_LEVEL);
bundle.setMarkedAsStarted(false);

Back to the top