Initial release into build132 stream. (130 code base)
diff --git a/bundles/org.eclipse.core.boot/plugin.xml b/bundles/org.eclipse.core.boot/plugin.xml index 594d56b..0ba3314 100644 --- a/bundles/org.eclipse.core.boot/plugin.xml +++ b/bundles/org.eclipse.core.boot/plugin.xml
@@ -12,3 +12,4 @@ </runtime> </plugin> +
diff --git a/bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/DelegatingURLClassLoader.java b/bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/DelegatingURLClassLoader.java index a3bf49b..462a836 100644 --- a/bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/DelegatingURLClassLoader.java +++ b/bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/DelegatingURLClassLoader.java
@@ -123,14 +123,7 @@ } public DelegatingURLClassLoader(URL[] codePath, URLContentFilter[] codeFilters, URL[] resourcePath, URLContentFilter[] resourceFilters, ClassLoader parent) { - -// Instead of constructing the loader with supplied classpath, create loader -// with empty path, "fix up" jar entries and then explicitly add the classpath -// to the newly constructed loader - - super(mungeJarURLs (codePath), parent); - resourcePath = mungeJarURLs(resourcePath); - + super(codePath, parent); if (resourcePath != null && resourcePath.length > 0) resourceLoader = new ResourceLoader(resourcePath); @@ -152,34 +145,6 @@ } } } - -/** - * strip-off jar: protocol - */ -private static URL mungeJarURL(URL url) { - if (url.getProtocol().equals("jar")) { - String file = url.getFile(); - if (file.startsWith("file:") || file.startsWith("valoader:")) { - int ix = file.indexOf("!/"); - if (ix != -1) file = file.substring(0,ix); - try { - url = new URL(file); - } catch (MalformedURLException e) { - // just use the original if we cannot create a new one - } - } - } - return url; -} - -private static URL[] mungeJarURLs(URL[] urls) { - if (urls == null) - return null; - for (int i = 0; i < urls.length; i++) - urls[i] = mungeJarURL(urls[i]); - return urls; -} - /** * Returns the absolute path name of a native library. The VM * invokes this method to locate the native libraries that belong @@ -611,8 +576,6 @@ } URLContentFilter filter = (URLContentFilter) filterTable.get(lib); - // retry with non-jar URL if necessary - if (filter == null) filter = (URLContentFilter) filterTable.get(mungeJarURL(lib)); if (filter == null) { if (DEBUG) debug("Unable to find library filter for " + name + " from " + lib);
diff --git a/bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/LaunchInfo.java b/bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/LaunchInfo.java index a7e8f0f..7e9242b 100644 --- a/bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/LaunchInfo.java +++ b/bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/LaunchInfo.java
@@ -128,7 +128,7 @@ public History(URL url,String id) { this.url = url; - this.date = id==null ? null : new Date(Long.parseLong(id)); + this.date = id==null ? null : new Date(Long.parseLong(id,Character.MAX_RADIX)); } public String toString() { @@ -155,7 +155,7 @@ if (date==null) return null; else - return Long.toString(date.getTime()); + return Long.toString(date.getTime(),Character.MAX_RADIX); } public boolean isCurrent() { @@ -566,7 +566,7 @@ try { if (time.length()>0) { time = time.substring(1); - date = new Date(Long.parseLong(time)); + date = new Date(Long.parseLong(time,Character.MAX_RADIX)); } URL newurl = new URL(url,list[i]); if (time.length()>0) @@ -846,7 +846,7 @@ id = props.getProperty(ID,""); if (id.trim().equals("")) - id = Long.toString((new java.util.Date()).getTime()); + id = Long.toString((new java.util.Date()).getTime(),Character.MAX_RADIX); platform = props.getProperty(PLATFORM,DEFAULT_PLATFORM); app = props.getProperty(APP,DEFAULT_APP); if (app.trim().equals("")) @@ -965,7 +965,7 @@ File f = new File(dir, info); if (!f.exists()) return; - String stamp = Long.toString(f.lastModified()); + String stamp = Long.toString(f.lastModified(),Character.MAX_RADIX); if (key.startsWith(info+"."+stamp)) return; if (DEBUG) @@ -1017,7 +1017,7 @@ loadListPropertyEntry(cfgIds,props.getProperty(INFO_CONFIGS),VersionedIdentifier.class); ArrayList cmpIds = new ArrayList(); loadListPropertyEntry(cmpIds,props.getProperty(INFO_COMPS),VersionedIdentifier.class); - String stamp = Long.toString(f.lastModified()); + String stamp = Long.toString(f.lastModified(),Character.MAX_RADIX); String key = info+"."+stamp+"."+INFO_CONFIGS; infoMap.put(key, cfgIds); key = info+"."+stamp+"."+INFO_COMPS; @@ -1454,12 +1454,12 @@ private void setNewHistory() { if (newHistory) return; - nextId = Long.toString((new java.util.Date()).getTime()); + nextId = Long.toString((new java.util.Date()).getTime(),Character.MAX_RADIX); newHistory = true; } private void setNewId() { - id = Long.toString((new java.util.Date()).getTime()); + id = Long.toString((new java.util.Date()).getTime(),Character.MAX_RADIX); } public void setPlugin(VersionedIdentifier plugin) {
diff --git a/bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/PlatformURLConnection.java b/bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/PlatformURLConnection.java index 8bb4e22..673def1 100644 --- a/bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/PlatformURLConnection.java +++ b/bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/PlatformURLConnection.java
@@ -236,7 +236,7 @@ // attemp to cache int ix = file.lastIndexOf("/"); tmp = file.substring(ix+1); - tmp = cacheLocation + filePrefix + Long.toString((new java.util.Date()).getTime()) + "_" + tmp; + tmp = cacheLocation + filePrefix + Long.toString((new java.util.Date()).getTime(),36) + "_" + tmp; tmp = tmp.replace(File.separatorChar,'/'); if (isJar) { tmp = PlatformURLHandler.FILE + PlatformURLHandler.PROTOCOL_SEPARATOR + tmp + PlatformURLHandler.JAR_SEPARATOR + jarEntry; @@ -379,7 +379,7 @@ tmp += CACHE_DIR; props.put(CACHE_LOCATION_PROP,tmp); - tmp = Long.toString((new java.util.Date()).getTime()); + tmp = Long.toString((new java.util.Date()).getTime(),36); props.put(CACHE_PREFIX_PROP,tmp); tmp += CACHE_INDEX;