diff options
author | Curtis D'Entremont | 2006-02-23 22:52:07 +0000 |
---|---|---|
committer | Curtis D'Entremont | 2006-02-23 22:52:07 +0000 |
commit | ef27e08a279763a4053983a40067ae24b26f551d (patch) | |
tree | 849e2ad6c39da41739d01f2042078ceb864d910d /org.eclipse.help.appserver | |
parent | 30ea6aac36e1aa6c7a1cc2548e55f7dcbbfbc742 (diff) | |
download | eclipse.platform.ua-ef27e08a279763a4053983a40067ae24b26f551d.tar.gz eclipse.platform.ua-ef27e08a279763a4053983a40067ae24b26f551d.tar.xz eclipse.platform.ua-ef27e08a279763a4053983a40067ae24b26f551d.zip |
127121 Fix warnings in UA plugins
Diffstat (limited to 'org.eclipse.help.appserver')
4 files changed, 7 insertions, 7 deletions
diff --git a/org.eclipse.help.appserver/META-INF/MANIFEST.MF b/org.eclipse.help.appserver/META-INF/MANIFEST.MF index d6871b554..298851dda 100644 --- a/org.eclipse.help.appserver/META-INF/MANIFEST.MF +++ b/org.eclipse.help.appserver/META-INF/MANIFEST.MF @@ -7,6 +7,6 @@ Bundle-ClassPath: . Bundle-Activator: org.eclipse.help.internal.appserver.AppserverPlugin Bundle-Vendor: %providerName Bundle-Localization: plugin -Export-Package: org.eclipse.help.internal.appserver;x-friends:="org.eclipse.help.base,org.eclipse.help.ui,org.eclipse.ua.tests" +Export-Package: org.eclipse.help.internal.appserver;x-friends:="org.eclipse.help.base,org.eclipse.help.ui,org.eclipse.ua.tests,org.eclipse.tomcat" Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)" Eclipse-LazyStart: true diff --git a/org.eclipse.help.appserver/src/org/eclipse/help/internal/appserver/AppserverPlugin.java b/org.eclipse.help.appserver/src/org/eclipse/help/internal/appserver/AppserverPlugin.java index dc7e22149..1944faae3 100644 --- a/org.eclipse.help.appserver/src/org/eclipse/help/internal/appserver/AppserverPlugin.java +++ b/org.eclipse.help.appserver/src/org/eclipse/help/internal/appserver/AppserverPlugin.java @@ -104,7 +104,7 @@ public class AppserverPlugin extends Plugin { appServer = (IWebappServer) serverElement .createExecutableExtension(APP_SERVER_CLASS_ATTRIBUTE); contributingServerPlugin = serverElement - .getNamespace(); + .getContributor().getName(); } catch (CoreException e) { getLog().log(e.getStatus()); throw e; diff --git a/org.eclipse.help.appserver/src/org/eclipse/help/internal/appserver/PluginClassLoaderWrapper.java b/org.eclipse.help.appserver/src/org/eclipse/help/internal/appserver/PluginClassLoaderWrapper.java index c15d8e8a1..cfa08d524 100644 --- a/org.eclipse.help.appserver/src/org/eclipse/help/internal/appserver/PluginClassLoaderWrapper.java +++ b/org.eclipse.help.appserver/src/org/eclipse/help/internal/appserver/PluginClassLoaderWrapper.java @@ -66,7 +66,7 @@ public class PluginClassLoaderWrapper extends URLClassLoader { URL url = b.getEntry(path); if (url != null) try { - urls.add(Platform.asLocalURL(url)); + urls.add(FileLocator.toFileURL(url)); } catch (IOException ioe) { } } @@ -79,7 +79,7 @@ public class PluginClassLoaderWrapper extends URLClassLoader { URL url = b.getEntry(devpaths[i]); if (url != null) try { - urls.add(Platform.asLocalURL(url)); + urls.add(FileLocator.toFileURL(url)); } catch (IOException ioe) { } } diff --git a/org.eclipse.help.appserver/src/org/eclipse/help/internal/appserver/WebappManager.java b/org.eclipse.help.appserver/src/org/eclipse/help/internal/appserver/WebappManager.java index c290f263b..fa0c63967 100644 --- a/org.eclipse.help.appserver/src/org/eclipse/help/internal/appserver/WebappManager.java +++ b/org.eclipse.help.appserver/src/org/eclipse/help/internal/appserver/WebappManager.java @@ -116,15 +116,15 @@ public class WebappManager { // Note: we just look for one webapp directory. // If needed, may want to use the locale specific path. - URL webappURL = Platform.find(bundle, path); + URL webappURL = FileLocator.find(bundle, path, null); if (webappURL == null) { throw new CoreException(new Status(IStatus.ERROR, AppserverPlugin.PLUGIN_ID, IStatus.OK, NLS.bind(AppserverResources.Appserver_cannotFindPath, pluginId, path.toOSString()), null)); } try { - String webappLocation = Platform.asLocalURL( - Platform.resolve(webappURL)).getFile(); + String webappLocation = FileLocator.toFileURL( + FileLocator.resolve(webappURL)).getFile(); return new Path(webappLocation); } catch (IOException ioe) { throw new CoreException(new Status(IStatus.ERROR, |