diff options
author | Mat Booth | 2015-02-18 09:04:19 +0000 |
---|---|---|
committer | Mat Booth | 2015-02-18 11:39:12 +0000 |
commit | 1bf1c17ab4070679d47112a2a69ba3967e27c508 (patch) | |
tree | bf44f19769d46dc6b378b88c1c6c113606412df6 /tests | |
parent | 742a91ab0e685b1370753c5182035ce6027c22eb (diff) | |
download | eclipse.platform.team-1bf1c17ab4070679d47112a2a69ba3967e27c508.tar.gz eclipse.platform.team-1bf1c17ab4070679d47112a2a69ba3967e27c508.tar.xz eclipse.platform.team-1bf1c17ab4070679d47112a2a69ba3967e27c508.zip |
Bug 394739 - Remove org.eclipse.core.runtime.compatibility* bundles
Change-Id: Iacc036e92d43a5bca1a727f2dd203d1a39692f9a
Signed-off-by: Mat Booth <mat.booth@redhat.com>
Diffstat (limited to 'tests')
3 files changed, 7 insertions, 12 deletions
diff --git a/tests/org.eclipse.team.tests.core/META-INF/MANIFEST.MF b/tests/org.eclipse.team.tests.core/META-INF/MANIFEST.MF index f7a93288c..3891c3ac5 100644 --- a/tests/org.eclipse.team.tests.core/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.team.tests.core/META-INF/MANIFEST.MF @@ -3,7 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.team.tests.core; singleton:=true Bundle-Version: 3.7.300.qualifier -Bundle-Activator: org.eclipse.core.internal.compatibility.PluginActivator Bundle-Vendor: %providerName Bundle-Localization: plugin Export-Package: org.eclipse.team.tests.core, @@ -18,7 +17,7 @@ Require-Bundle: org.eclipse.ui.ide;resolution:=optional, org.eclipse.ui.editors;resolution:=optional, org.eclipse.core.tests.harness, org.eclipse.core.resources, - org.eclipse.core.runtime.compatibility, + org.eclipse.core.runtime, org.eclipse.team.core, org.eclipse.team.cvs.core, org.eclipse.team.ui, diff --git a/tests/org.eclipse.team.tests.cvs.core/META-INF/MANIFEST.MF b/tests/org.eclipse.team.tests.cvs.core/META-INF/MANIFEST.MF index 04ce570bf..5a2bdb04e 100644 --- a/tests/org.eclipse.team.tests.cvs.core/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.team.tests.cvs.core/META-INF/MANIFEST.MF @@ -23,7 +23,6 @@ Require-Bundle: org.eclipse.ui.ide;resolution:=optional, org.eclipse.ui.workbench.texteditor;resolution:=optional, org.eclipse.ui.editors;resolution:=optional, org.eclipse.core.tests.harness, - org.eclipse.core.runtime.compatibility, org.eclipse.core.runtime, org.eclipse.core.resources, org.eclipse.team.core, diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ModuleTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ModuleTest.java index 09b262990..4a816213c 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ModuleTest.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ModuleTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2006 IBM Corporation and others. + * Copyright (c) 2000, 2015 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -22,9 +22,8 @@ import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.resources.IWorkspaceRoot; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IPluginDescriptor; -import org.eclipse.core.runtime.IPluginRegistry; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Platform; import org.eclipse.team.core.TeamException; @@ -33,8 +32,8 @@ import org.eclipse.team.internal.ccvs.core.ICVSFolder; import org.eclipse.team.internal.ccvs.core.ICVSRemoteResource; import org.eclipse.team.internal.ccvs.core.ICVSResource; import org.eclipse.team.internal.ccvs.core.client.Command; -import org.eclipse.team.internal.ccvs.core.client.Session; import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption; +import org.eclipse.team.internal.ccvs.core.client.Session; import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; import org.eclipse.team.internal.ccvs.core.resources.RemoteFolder; import org.eclipse.team.internal.ccvs.core.resources.RemoteModule; @@ -94,11 +93,9 @@ public class ModuleTest extends EclipseTest { protected void uploadProject(String projectName) throws TeamException, IOException, CoreException { // locate the test case contents in the plugin resources - IPluginRegistry registry = Platform.getPluginRegistry(); - IPluginDescriptor descriptor = registry.getPluginDescriptor("org.eclipse.team.tests.cvs.core"); - URL baseURL = descriptor.getInstallURL(); - URL url = new URL(baseURL, RESOURCE_PATH + projectName); - url = Platform.resolve(url); + Bundle bundle = Platform.getBundle("org.eclipse.team.tests.cvs.core"); + URL url = bundle.getEntry(RESOURCE_PATH + projectName); + url = FileLocator.resolve(url); Assert.assertTrue(url.getProtocol().equals("file")); IPath path = new Path(url.getPath()); |