[132041] Exported packages.
Cleaned up use of deprecated methods in Eclipse 3.2.
diff --git a/plugins/org.eclipse.wst.common.uriresolver/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.common.uriresolver/META-INF/MANIFEST.MF
index 289398d..5442249 100644
--- a/plugins/org.eclipse.wst.common.uriresolver/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.common.uriresolver/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.wst.common.uriresolver; singleton:=true
-Bundle-Version: 1.0.1.qualifier
+Bundle-Version: 1.0.101.qualifier
Bundle-Activator: org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.common.uriresolver.internal;x-internal:=true,
- org.eclipse.wst.common.uriresolver.internal.provisional;x-internal:=true,
- org.eclipse.wst.common.uriresolver.internal.util;x-internal:=true
+Export-Package: org.eclipse.wst.common.uriresolver.internal,
+ org.eclipse.wst.common.uriresolver.internal.provisional,
+ org.eclipse.wst.common.uriresolver.internal.util
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources
-Eclipse-AutoStart: true
+Eclipse-LazyStart: true
Bundle-ClassPath: .
diff --git a/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/URIResolverExtensionRegistryReader.java b/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/URIResolverExtensionRegistryReader.java
index 35eb702..a173f28 100644
--- a/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/URIResolverExtensionRegistryReader.java
+++ b/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/URIResolverExtensionRegistryReader.java
@@ -113,7 +113,7 @@
{
try
{
- String pluginId = element.getDeclaringExtension().getNamespace();
+ String pluginId = element.getDeclaringExtension().getNamespaceIdentifier();
int stageint = URIResolverExtensionRegistry.STAGE_POSTNORMALIZATION;
if (stage.equalsIgnoreCase(VAL_STAGE_PRE))
diff --git a/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/util/URIHelper.java b/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/util/URIHelper.java
index e564f41..72e94fc 100644
--- a/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/util/URIHelper.java
+++ b/plugins/org.eclipse.wst.common.uriresolver/src/org/eclipse/wst/common/uriresolver/internal/util/URIHelper.java
@@ -18,9 +18,9 @@
import java.net.URL;
import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
public class URIHelper
@@ -176,7 +176,7 @@
{
urlspec = urlspec.replace('\\', '/');
URL url = new URL(urlspec);
- URL resolvedURL = Platform.resolve(url);
+ URL resolvedURL = FileLocator.resolve(url);
result = resolvedURL.toString();
}
catch (Exception e)
