### Eclipse Workspace Patch 1.0 #P org.eclipse.osgi Index: eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java,v retrieving revision 1.13 diff -u -r1.13 PluginConverterImpl.java --- eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java 13 Apr 2006 16:10:27 -0000 1.13 +++ eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/PluginConverterImpl.java 15 Jun 2006 15:02:38 -0000 @@ -14,8 +14,8 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.*; -import java.util.jar.JarEntry; -import java.util.jar.JarFile; +import java.util.zip.ZipEntry; +import java.util.zip.ZipFile; import org.eclipse.core.runtime.adaptor.*; import org.eclipse.osgi.framework.adaptor.FrameworkAdaptor; import org.eclipse.osgi.framework.internal.core.Constants; @@ -511,9 +511,9 @@ private Set getExportsFromJAR(File jarFile) { Set names = new HashSet(); - JarFile file = null; + ZipFile file = null; try { - file = new JarFile(jarFile, false); + file = new ZipFile(jarFile); } catch (IOException e) { String message = NLS.bind(EclipseAdaptorMsg.ECLIPSE_CONVERTER_PLUGIN_LIBRARY_IGNORED, jarFile, pluginInfo.getUniqueId()); adaptor.getFrameworkLog().log(new FrameworkLogEntry(FrameworkAdaptor.FRAMEWORK_SYMBOLICNAME, FrameworkLogEntry.ERROR, 0, message, 0, e, null)); @@ -521,7 +521,7 @@ } //Run through the entries for (Enumeration entriesEnum = file.entries(); entriesEnum.hasMoreElements();) { - JarEntry entry = (JarEntry) entriesEnum.nextElement(); + ZipEntry entry = (ZipEntry) entriesEnum.nextElement(); String name = entry.getName(); if (!isValidPackageName(name)) continue;