diff options
author | Pascal Rapicault | 2008-01-30 14:53:16 +0000 |
---|---|---|
committer | Pascal Rapicault | 2008-01-30 14:53:16 +0000 |
commit | 6e840b733b1417642b1d2c02175dbee1f9f960a7 (patch) | |
tree | 4a2f39e57405eba7868bc53ff07dbbd8286202ba /bundles/org.eclipse.equinox.frameworkadmin.equinox/src | |
parent | 57870e66ef7fae7685c5eeb2e57effd0d91509ba (diff) | |
download | rt.equinox.p2-6e840b733b1417642b1d2c02175dbee1f9f960a7.tar.gz rt.equinox.p2-6e840b733b1417642b1d2c02175dbee1f9f960a7.tar.xz rt.equinox.p2-6e840b733b1417642b1d2c02175dbee1f9f960a7.zip |
Bug 208065 - osgi.bundles.extraData in config.ini contains all installed bundles
Diffstat (limited to 'bundles/org.eclipse.equinox.frameworkadmin.equinox/src')
2 files changed, 2 insertions, 57 deletions
diff --git a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/frameworkadmin/equinox/internal/EquinoxConstants.java b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/frameworkadmin/equinox/internal/EquinoxConstants.java index bc77d05f1..86cdfa282 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/frameworkadmin/equinox/internal/EquinoxConstants.java +++ b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/frameworkadmin/equinox/internal/EquinoxConstants.java @@ -41,7 +41,6 @@ public class EquinoxConstants { public static final String PROP_INSTALL = "osgi.install"; //$NON-NLS-1$ public static final String PROP_ECLIPSE_COMMANDS = "eclipse.commands"; //$NON-NLS-1$ public static final String PROP_OSGI_FW = "osgi.framework"; //$NON-NLS-1$ - public static final String PROP_BUNDLES_EXTRADATA = "osgi.bundles.extraData"; //$NON-NLS-1$ public static final String PROP_LAUNCHER_PATH = "osgi.launcherPath"; //$NON-NLS-1$ public static final String PROP_LAUNCHER_NAME = "osgi.launcherIni"; //$NON-NLS-1$ diff --git a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/frameworkadmin/equinox/internal/EquinoxFwConfigFileParser.java b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/frameworkadmin/equinox/internal/EquinoxFwConfigFileParser.java index 1d23e637d..dc22c3ec4 100644 --- a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/frameworkadmin/equinox/internal/EquinoxFwConfigFileParser.java +++ b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/frameworkadmin/equinox/internal/EquinoxFwConfigFileParser.java @@ -11,7 +11,8 @@ package org.eclipse.equinox.frameworkadmin.equinox.internal; import java.io.*; import java.net.MalformedURLException; import java.net.URL; -import java.util.*; +import java.util.Enumeration; +import java.util.Properties; import org.eclipse.equinox.frameworkadmin.*; import org.eclipse.equinox.frameworkadmin.equinox.internal.utils.FileUtils; import org.eclipse.equinox.internal.frameworkadmin.utils.Utils; @@ -23,7 +24,6 @@ public class EquinoxFwConfigFileParser { private static final String KEY_ECLIPSE_PROV_DATA_AREA = "eclipse.p2.data.area"; //$NON-NLS-1$ private static final String KEY_ORG_ECLIPSE_EQUINOX_SIMPLECONFIGURATOR_CONFIGURL = "org.eclipse.equinox.simpleconfigurator.configUrl"; //$NON-NLS-1$ private static final String KEY_OSGI_BUNDLES = "osgi.bundles"; //$NON-NLS-1$ - private static final String KEY_OSGI_BUNDLES_EXTRA_DATA = "osgi.bundles.extraData"; //$NON-NLS-1$ private static final String KEY_OSGI_FRAMEWORK = "osgi.framework"; //$NON-NLS-1$ private static final String KEY_OSGI_LAUNCHER_PATH = "osgi.launcherPath"; //$NON-NLS-1$ private static final String[] PATHS = new String[] {KEY_OSGI_LAUNCHER_PATH, KEY_ECLIPSE_PROV_CACHE}; @@ -107,7 +107,6 @@ public class EquinoxFwConfigFileParser { sb.append(","); } props.setProperty(EquinoxConstants.PROP_BUNDLES, sb.toString()); - setOSGiBundlesExtraData(props, bInfos); } //TODO The following merging operations are suspicious. @@ -134,12 +133,6 @@ public class EquinoxFwConfigFileParser { return props; } - private static String getExtraDataCommandLine(BundleInfo bundleInfo, final URL baseUrl) { - StringBuffer sb = new StringBuffer(); - sb.append(bundleInfo.getLocation()).append(',').append(bundleInfo.getSymbolicName()).append(',').append(bundleInfo.getVersion()); - return sb.toString(); - } - private static boolean getMarkedAsStartedFormat(String msg, String original) { if (msg == null) return false; @@ -235,18 +228,6 @@ public class EquinoxFwConfigFileParser { } } - private static void setOSGiBundlesExtraData(Properties props, BundleInfo[] bInfos) { - StringBuffer sb = new StringBuffer(); - for (int i = 0; i < bInfos.length; i++) { - normalizeLocation(bInfos[i]); - sb.append(getExtraDataCommandLine(bInfos[i], null)); - if (i + 1 < bInfos.length) - sb.append(","); - } - props.setProperty(EquinoxConstants.PROP_BUNDLES_EXTRADATA, sb.toString()); - - } - /** * inputFile must be not a directory but a file. * @@ -346,23 +327,6 @@ public class EquinoxFwConfigFileParser { if (parent != null) props.setProperty(KEY_OSGI_BUNDLES, EquinoxManipulatorImpl.makeRelative(value, parent.toURL())); } - - String extra = props.getProperty(KEY_OSGI_BUNDLES_EXTRA_DATA); - if (extra != null) { - StringBuffer buffer = new StringBuffer(); - for (StringTokenizer tokenizer = new StringTokenizer(extra, ","); tokenizer.hasMoreTokens();) { - String token = tokenizer.nextToken(); - String absolute = EquinoxManipulatorImpl.makeRelative(token, rootURL); - buffer.append(absolute); - buffer.append(','); - buffer.append(tokenizer.nextToken()); - buffer.append(','); - buffer.append(tokenizer.nextToken()); - if (tokenizer.hasMoreTokens()) - buffer.append(','); - } - props.setProperty(KEY_OSGI_BUNDLES_EXTRA_DATA, buffer.toString()); - } return props; } @@ -385,24 +349,6 @@ public class EquinoxFwConfigFileParser { if (parent != null) props.setProperty(KEY_OSGI_BUNDLES, EquinoxManipulatorImpl.makeArrayAbsolute(value, parent.toURL())); } - - String extra = props.getProperty(KEY_OSGI_BUNDLES_EXTRA_DATA); - if (extra != null) { - StringBuffer buffer = new StringBuffer(); - for (StringTokenizer tokenizer = new StringTokenizer(extra, ","); tokenizer.hasMoreTokens();) { - String token = tokenizer.nextToken(); - String absolute = EquinoxManipulatorImpl.makeAbsolute(token, rootURL); - buffer.append(absolute); - buffer.append(','); - buffer.append(tokenizer.nextToken()); - buffer.append(','); - buffer.append(tokenizer.nextToken()); - if (tokenizer.hasMoreTokens()) - buffer.append(','); - } - props.setProperty(KEY_OSGI_BUNDLES_EXTRA_DATA, buffer.toString()); - } - return props; } |